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

Commit cbd4d677 authored by Adam Bookatz's avatar Adam Bookatz Committed by Automerger Merge Worker
Browse files

Merge "QUERY_USERS is a privileged permission" into udc-dev am: 9c03e79e 

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



Change-Id: Ie82e294bfca87c9fd853ad24ab534e4e3a3ffb16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d4a8074d 9c03e79e

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -3161,7 +3161,7 @@ 
    <!-- @SystemApi @hide Allows an application to call APIs that allow it to query users on the

         device. -->

    <permission android:name="android.permission.QUERY_USERS"

                android:protectionLevel="signature|role" />

                android:protectionLevel="signature|privileged|role" />



    <!-- Allows an application to access data blobs across users. -->

    <permission android:name="android.permission.ACCESS_BLOBS_ACROSS_USERS"

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ applications that come with the platform 
        <!-- Permission required to test onPermissionsChangedListener -->

        <permission name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.QUERY_USERS"/>

        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>

        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>

        <permission name="android.permission.MANAGE_DEVICE_ADMINS"/>