Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0e9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563673

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06bb9493cb78e85c8092056bfd08d7ec2adecccc
This commit is contained in:
Kholoud Mohamed
2021-02-05 18:53:52 +00:00
committed by Automerger Merge Worker
parent c088d267a1 de2340c0e9
commit c3ef384607
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -18,6 +18,7 @@ package android {
field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS"; 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 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 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_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 READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS"; field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";

4
core/res/AndroidManifest.xml
View File

@@ -2499,6 +2499,10 @@
<permission android:name="android.permission.CREATE_USERS" <permission android:name="android.permission.CREATE_USERS"
android:protectionLevel="signature" /> 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. <!-- @hide Allows an application to set the profile owners and the device owner.
This permission is not available to third party applications.--> This permission is not available to third party applications.-->
<permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"

1
data/etc/privapp-permissions-platform.xml
View File

@@ -446,6 +446,7 @@ applications that come with the platform
<!-- Permission required for GTS test - GtsAssistIntentTestCases --> <!-- Permission required for GTS test - GtsAssistIntentTestCases -->
<permission name="android.permission.MANAGE_SOUND_TRIGGER" /> <permission name="android.permission.MANAGE_SOUND_TRIGGER" />
<permission name="android.permission.CAPTURE_AUDIO_HOTWORD" /> <permission name="android.permission.CAPTURE_AUDIO_HOTWORD" />
<permission name="android.permission.MODIFY_QUIET_MODE" />
</privapp-permissions> </privapp-permissions>
<privapp-permissions package="com.android.statementservice"> <privapp-permissions package="com.android.statementservice">

2
packages/Shell/AndroidManifest.xml
View File

@@ -121,6 +121,8 @@
<uses-permission android:name="android.permission.CREATE_USERS" /> <uses-permission android:name="android.permission.CREATE_USERS" />
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" /> <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.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.ACCESS_LOWPAN_STATE"/>
<uses-permission android:name="android.permission.CHANGE_LOWPAN_STATE"/> <uses-permission android:name="android.permission.CHANGE_LOWPAN_STATE"/>
<uses-permission android:name="android.permission.READ_LOWPAN_CREDENTIAL"/> <uses-permission android:name="android.permission.READ_LOWPAN_CREDENTIAL"/>