diff options
| author | Nagesh Pachorkar <nageshpa@google.com> | 2023-04-11 16:48:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-11 16:48:57 +0000 |
| commit | eda68434cb616a1a549cff94d9267bdc5e281d63 (patch) | |
| tree | a9d0af8659331162587e6baa7b9ab4fd068cfe58 /PermissionController/src/com/android/permissioncontroller/permission/utils | |
| parent | 53fe427816daa249cb4ed4d2e7b735570aada6a1 (diff) | |
| parent | 747e4bd3610c18dc9e40cb132f91f6292274abc1 (diff) | |
| download | Permission-eda68434cb616a1a549cff94d9267bdc5e281d63.tar.gz | |
Merge "Revert "Introduced granular skin temperature permissions"" into udc-dev
Diffstat (limited to 'PermissionController/src/com/android/permissioncontroller/permission/utils')
3 files changed, 0 insertions, 20 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt index be72e6f2f..b06a09b28 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/PermissionMapping.kt @@ -183,13 +183,6 @@ object PermissionMapping { Manifest.permission_group.SENSORS } - if (SdkLevel.isAtLeastU()) { - PLATFORM_PERMISSIONS[Utils.BODY_SENSORS_WRIST_TEMPERATURE] = - Manifest.permission_group.SENSORS - PLATFORM_PERMISSIONS[Utils.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND] = - Manifest.permission_group.SENSORS - } - for ((permission, permissionGroup) in PLATFORM_PERMISSIONS) { PLATFORM_PERMISSION_GROUPS.getOrPut(permissionGroup) { mutableListOf() }.add(permission) } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java index b0aaac9ea..42f3afd95 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/Utils.java @@ -253,12 +253,6 @@ public final class Utils { private static final String SYSTEM_VISUAL_INTELLIGENCE = "android.app.role.SYSTEM_VISUAL_INTELLIGENCE"; - public static final String BODY_SENSORS_WRIST_TEMPERATURE = - "android.permission.BODY_SENSORS_WRIST_TEMPERATURE"; - - public static final String BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND = - "android.permission.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND"; - // TODO: theianchen Using hardcoded values here as a WIP solution for now. private static final String[] EXEMPTED_ROLES = { SYSTEM_AMBIENT_AUDIO_INTELLIGENCE, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java b/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java index e9d68c9c6..9b7927c1d 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/v31/AdminRestrictedPermissionsUtils.java @@ -53,13 +53,6 @@ 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( - Utils.BODY_SENSORS_WRIST_TEMPERATURE); - ADMIN_RESTRICTED_SENSORS_PERMISSIONS.add( - Utils.BODY_SENSORS_WRIST_TEMPERATURE_BACKGROUND); - } } /** |