diff options
| author | 2021-02-05 19:27:46 +0000 | |
|---|---|---|
| committer | 2021-02-05 19:27:46 +0000 | |
| commit | dc49545fd17f4ac8aedfa6febeec5c3178ea2ef6 (patch) | |
| tree | a47a3fac1827061196b72460375221620ab0e85f | |
| parent | d6e31fbd8b776dd5b4408b40cedf3e974e167b5b (diff) | |
| parent | c3ef38460785799f778995368c4499f3b57d6da6 (diff) | |
Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0e9 am: c3ef384607
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563673
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5798dec22b49c4408b3d030fd5d447636350d09d
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 546e72b8f834..668b5883cbfb 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -18,6 +18,7 @@ package android { field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS"; field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK"; field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS"; + field public static final String QUERY_USERS = "android.permission.QUERY_USERS"; field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS"; field public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE"; field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8c31c8a590f1..3565908535be 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2506,6 +2506,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" diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index f986f1550a72..e491db5fcabf 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -448,6 +448,7 @@ applications that come with the platform <!-- Permission required for GTS test - GtsAssistIntentTestCases --> <permission name="android.permission.MANAGE_SOUND_TRIGGER" /> <permission name="android.permission.CAPTURE_AUDIO_HOTWORD" /> + <permission name="android.permission.MODIFY_QUIET_MODE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 135356c864ec..39be9cbff40d 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -121,6 +121,8 @@ <uses-permission android:name="android.permission.CREATE_USERS" /> <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" /> + <uses-permission android:name="android.permission.QUERY_USERS" /> + <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" /> <uses-permission android:name="android.permission.ACCESS_LOWPAN_STATE"/> <uses-permission android:name="android.permission.CHANGE_LOWPAN_STATE"/> <uses-permission android:name="android.permission.READ_LOWPAN_CREDENTIAL"/> |