Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8bb4a06 authored by Scarlett Song's avatar Scarlett Song Committed by Android (Google) Code Review
Browse files

Merge "Heart Rate Sensor: Import permission aconfig flag and guard heart rate...

Merge "Heart Rate Sensor: Import permission aconfig flag and guard heart rate sensor by android.health.READ_HEART_RATE when flag enabled" into main
parents 4a4c332d b7a1db65
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ cc_library {

    static_libs: [
        "libsensor_flags_c_lib",
        "android.permission.flags-aconfig-cc",
    ],

    export_include_dirs: ["include"],
+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@
#include <binder/AppOpsManager.h>
#include <binder/IPermissionController.h>
#include <binder/IServiceManager.h>
#include <android_permission_flags.h>

/*
 * 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
        break;
    case SENSOR_TYPE_HEART_RATE: {
        mStringType = SENSOR_STRING_TYPE_HEART_RATE;
        mRequiredPermission = SENSOR_PERMISSION_BODY_SENSORS;
        mRequiredPermission =
          android::permission::flags::replace_body_sensor_permission_enabled() ?
            SENSOR_PERMISSION_READ_HEART_RATE : SENSOR_PERMISSION_BODY_SENSORS;
        AppOpsManager appOps;
        mRequiredAppOp = appOps.permissionToOpCode(String16(mRequiredPermission));
        mFlags |= SENSOR_FLAG_ON_CHANGE_MODE;