Skip to content

Commit b8bb4a0

Browse files
Scarlett SongAndroid (Google) Code Review
authored andcommitted
Merge "Heart Rate Sensor: Import permission aconfig flag and guard heart rate sensor by android.health.READ_HEART_RATE when flag enabled" into main
2 parents 4a4c332 + b7a1db6 commit b8bb4a0

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

libs/sensor/Android.bp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ cc_library {
6969

7070
static_libs: [
7171
"libsensor_flags_c_lib",
72+
"android.permission.flags-aconfig-cc",
7273
],
7374

7475
export_include_dirs: ["include"],

libs/sensor/Sensor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <binder/AppOpsManager.h>
2222
#include <binder/IPermissionController.h>
2323
#include <binder/IServiceManager.h>
24+
#include <android_permission_flags.h>
2425

2526
/*
2627
* The permission to use for activity recognition sensors (like step counter).
@@ -121,7 +122,9 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi
121122
break;
122123
case SENSOR_TYPE_HEART_RATE: {
123124
mStringType = SENSOR_STRING_TYPE_HEART_RATE;
124-
mRequiredPermission = SENSOR_PERMISSION_BODY_SENSORS;
125+
mRequiredPermission =
126+
android::permission::flags::replace_body_sensor_permission_enabled() ?
127+
SENSOR_PERMISSION_READ_HEART_RATE : SENSOR_PERMISSION_BODY_SENSORS;
125128
AppOpsManager appOps;
126129
mRequiredAppOp = appOps.permissionToOpCode(String16(mRequiredPermission));
127130
mFlags |= SENSOR_FLAG_ON_CHANGE_MODE;

0 commit comments

Comments
 (0)