diff options
| author | 2023-01-25 14:38:49 +0000 | |
|---|---|---|
| committer | 2023-01-25 14:38:49 +0000 | |
| commit | aad0d20d94bf24f8d34d9b26b1f7ecffb514e32a (patch) | |
| tree | b87334b4e227fda7db80e2ea77fb9ac86a2a7599 | |
| parent | de00ecb0b4391349f426a10c1fd58abe0a1832a7 (diff) | |
| parent | 450f53e19e06c3c7f21a03e1ea77d1ae9428fa23 (diff) | |
Merge "Introduced granular skin temperature permissions"
3 files changed, 21 insertions, 2 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 239011fe1..352b94e4a 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -68,8 +68,12 @@ </permission-set> <permission-set name="sensors"> - <permission name="android.permission.BODY_SENSORS" /> - <permission name="android.permission.BODY_SENSORS_BACKGROUND" minSdkVersion="33" /> + <permission name="android.permission.BODY_SENSORS"/> + <permission name="android.permission.BODY_SENSORS_BACKGROUND" minSdkVersion="33"/> + <permission name="android.permission.BODY_SENSORS_WRIST_TEMPERATURE" + minSdkVersion="34"/> + <permission name="android.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND" + minSdkVersion="34"/> </permission-set> <permission-set name="storage"> diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/AdminRestrictedPermissionsUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/AdminRestrictedPermissionsUtils.java index 4ee6411d8..a6976b4c1 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/AdminRestrictedPermissionsUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/AdminRestrictedPermissionsUtils.java @@ -52,6 +52,13 @@ public final class AdminRestrictedPermissionsUtils { if (SdkLevel.isAtLeastT()) { ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add(Manifest.permission.BODY_SENSORS_BACKGROUND); } + // New U permissions - do not add unless running on U and above. + if (SdkLevel.isAtLeastU()) { + ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add( + Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE); + ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add( + Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND); + } } /** diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt index 4e70e1bc5..dd400950c 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt @@ -172,6 +172,14 @@ object PermissionMapping { Manifest.permission_group.SENSORS } + if (SdkLevel.isAtLeastU()) { + PLATFORM_PERMISSIONS[Manifest.permission.BODY_SENSORS_WRIST_TEMPERATURE] = + Manifest.permission_group.SENSORS + PLATFORM_PERMISSIONS[Manifest + .permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND] = + Manifest.permission_group.SENSORS + } + for ((permission, permissionGroup) in PLATFORM_PERMISSIONS) { PLATFORM_PERMISSION_GROUPS.getOrPut(permissionGroup) { mutableListOf() }.add(permission) } |