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

Commit 0980aa86 authored by Justin Lannin's avatar Justin Lannin
Browse files

ASM: Add required AppOp lookup to custom sensors for all permissions. 

Previously, we only made an AppOp lookup if the custom sensor used
BODY_SENSORS. We are deprecating BODY_SENSORS in favor of
READ_HEART_RATE and other granular health permissions. This CL ensures
the correct AppOp is used if the custom sensor uses these other
permissions.

In the spirit of flagging, we guard the expanded AppOp lookup behind
the replace_body_sensor_permission_enabled flag. However, it's worth
noting that any permission with an existing AppOp would now be used (not
just READ_HEART_RATE).

Bug: 377576685
Change-Id: Ia16663795479ee49d5b5a82cd5b304b6dd6a26f1
Flag: android.permission.flags.replace_body_sensor_permission_enabled
parent 52683c69

libs/sensor/Sensor.cpp

+12 −1
Original line number Diff line number Diff line
@@ -306,7 +306,18 @@ Sensor::Sensor(struct sensor_t const& hwSensor, const uuid_t& uuid, int halVersi 
        }

        if (halVersion > SENSORS_DEVICE_API_VERSION_1_0 && hwSensor.requiredPermission) {

            mRequiredPermission = hwSensor.requiredPermission;

            if (!strcmp(mRequiredPermission, SENSOR_PERMISSION_BODY_SENSORS)) {

            bool requiresBodySensorPermission =

                    !strcmp(mRequiredPermission, SENSOR_PERMISSION_BODY_SENSORS);

            if (android::permission::flags::replace_body_sensor_permission_enabled()) {

                if (requiresBodySensorPermission) {

                  ALOGE("Sensor %s using deprecated Body Sensor permission", mName.c_str());

                }



                AppOpsManager appOps;

                // Lookup to see if an AppOp exists for the permission. If none

                // does, the default value of -1 is used.

                mRequiredAppOp = appOps.permissionToOpCode(String16(mRequiredPermission));

            } else if (requiresBodySensorPermission) {

                AppOpsManager appOps;

                mRequiredAppOp = appOps.permissionToOpCode(String16(SENSOR_PERMISSION_BODY_SENSORS));

            }