summaryrefslogtreecommitdiff
path: root/core/res
diff options
context:
space:
mode:
authorKholoud Mohamed <kholoudm@google.com>2021-02-05 18:53:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-05 18:53:52 +0000
commitc3ef38460785799f778995368c4499f3b57d6da6 (patch)
tree304efac2323e07295a6028479ec1d8ec782e471e /core/res
parentc088d267a13482f45adc198f9db315d0cbdb54a6 (diff)
parentde2340c0e9235936c79aa01bbb33f0250c3c4f98 (diff)
Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563673 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06bb9493cb78e85c8092056bfd08d7ec2adecccc
Diffstat (limited to 'core/res')
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0e80c7b19224..af6b97318103 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2499,6 +2499,10 @@
<permission android:name="android.permission.CREATE_USERS"
android:protectionLevel="signature" />
+ <!-- @TestApi @hide Allows an application to query user info for all users on the device. -->
+ <permission android:name="android.permission.QUERY_USERS"
+ android:protectionLevel="signature" />
+
<!-- @hide Allows an application to set the profile owners and the device owner.
This permission is not available to third party applications.-->
<permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"