summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Salo <asalo@google.com> 2021-06-10 16:00:43 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-06-10 16:00:43 +0000
commit4e46adb80847156289609b76a931d0b27c3d2ff9 (patch)
tree19a66f73bdb7349af80569a49d8d0cb75c258e48
parentc0115519f6be9ef2ce336998d687893974aa0e57 (diff)
parente926962f5febc15f72030f2061d571e477459653 (diff)
Merge "Adds protection level 'role' to SYSTEM_CAMERA permission" into sc-dev
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6b6cbea94009..50a242cab481 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1408,13 +1408,13 @@
<!-- @SystemApi Required in addition to android.permission.CAMERA to be able to access
system only camera devices.
- <p>Protection level: system|signature
+ <p>Protection level: system|signature|role
@hide -->
<permission android:name="android.permission.SYSTEM_CAMERA"
android:permissionGroup="android.permission-group.UNDEFINED"
android:label="@string/permlab_systemCamera"
android:description="@string/permdesc_systemCamera"
- android:protectionLevel="system|signature" />
+ android:protectionLevel="system|signature|role" />
<!-- @SystemApi Allows receiving the camera service notifications when a camera is opened
(by a certain application package) or closed.