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

Commit dc49545f authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Grant shell QUERY_USERS and MODIFY_QUIET_MODE" am: de2340c0 am: c3ef3846 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5798dec22b49c4408b3d030fd5d447636350d09d
parents d6e31fbd c3ef3846

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -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"

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -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">

packages/Shell/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -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"/>