diff options
| author | 2024-02-13 05:47:38 +0000 | |
|---|---|---|
| committer | 2024-02-13 05:47:38 +0000 | |
| commit | c487d82563ee991c2045dd5be9aa8eaf4dcddf0d (patch) | |
| tree | 32886ca922a9762189f8be9c72ab76b32e421a95 | |
| parent | ab6c2737fd16baf91d3e4c3c8299342d87ef8631 (diff) | |
| parent | 97ebfa3f7f2154e8417a8d2ad7c37b2c454467d9 (diff) | |
Merge "Create a separate feature flag to control permissions what permissions are device aware" into main
| -rw-r--r-- | core/java/android/permission/flags.aconfig | 8 | ||||
| -rw-r--r-- | services/permission/java/com/android/server/permission/access/permission/PermissionService.kt | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig index 8c7050176506..9d7fb7018d52 100644 --- a/core/java/android/permission/flags.aconfig +++ b/core/java/android/permission/flags.aconfig @@ -94,3 +94,11 @@ flag { description: "Enable signature permission allowlist" bug: "308573169" } + +flag { + name: "device_aware_permissions_enabled" + is_fixed_read_only: true + namespace: "permissions" + description: "When the flag is off no permissions can be device aware" + bug: "274852670" +}
\ No newline at end of file diff --git a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt index 2f5c1092e67b..67f66de71d39 100644 --- a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt +++ b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt @@ -2958,7 +2958,7 @@ class PermissionService(private val service: AccessCheckingService) : /** These permissions are supported for virtual devices. */ // TODO: b/298661870 - Use new API to get the list of device aware permissions. val DEVICE_AWARE_PERMISSIONS = - if (Flags.deviceAwarePermissionApisEnabled()) { + if (Flags.deviceAwarePermissionsEnabled()) { setOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO) } else { emptySet<String>() |