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

Commit c487d825 authored by Yuting Fang's avatar Yuting Fang Committed by Android (Google) Code Review
Browse files

Merge "Create a separate feature flag to control permissions what permissions... 

Merge "Create a separate feature flag to control permissions what permissions are device aware" into main
parents ab6c2737 97ebfa3f

core/java/android/permission/flags.aconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -94,3 +94,11 @@ flag { 
  description: "Enable signature permission allowlist"

  description: "Enable signature permission allowlist"

  bug: "308573169"

  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

services/permission/java/com/android/server/permission/access/permission/PermissionService.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2958,7 +2958,7 @@ class PermissionService(private val service: AccessCheckingService) : 
        /** These permissions are supported for virtual devices. */

        /** These permissions are supported for virtual devices. */

        // TODO: b/298661870 - Use new API to get the list of device aware permissions.

        // TODO: b/298661870 - Use new API to get the list of device aware permissions.

        val DEVICE_AWARE_PERMISSIONS =

        val DEVICE_AWARE_PERMISSIONS =

            if (Flags.deviceAwarePermissionApisEnabled()) {

            if (Flags.deviceAwarePermissionsEnabled()) {

                setOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)

                setOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)

            } else {

            } else {

                emptySet<String>()

                emptySet<String>()