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

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

Merge "Remove no longer needed QUERY_USERS permission" am: 0969f502 

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

Change-Id: Ie996ba1238501c02f77217c500f86f39835f4758
parents 8ecef70e 0969f502

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ package android { 
    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_AUDIO_STATE = "android.permission.QUERY_AUDIO_STATE";

    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

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

packages/Shell/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 
    <uses-permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" />

    <uses-permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS" />

    <uses-permission android:name="android.permission.CLEAR_FREEZE_PERIOD" />

    <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"/>