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

Commit 37331adc authored by Mariana Arantes's avatar Mariana Arantes Committed by Android (Google) Code Review
Browse files

Merge "Update protection level for the OBSERVE_ROLE_HOLDERS permission." into main

parents eeca5edd fa97d99b

core/res/AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -6571,7 +6571,14 @@ 
    <!-- @SystemApi Allows an application to observe role holder changes.

         @hide -->

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

                android:protectionLevel="signature|installer|module" />

                android:protectionLevel="signature|installer|module"

                android:featureFlag="!android.permission.flags.supervision_role_enabled" />













    <!-- @SystemApi Allows an application to observe role holder changes.













         @hide -->













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













                android:protectionLevel="signature|privileged|installer|module"













                android:featureFlag="android.permission.flags.supervision_role_enabled" />





























    <!-- Allows an application to manage the companion devices.















         @hide -->

































data/etc/com.android.systemui.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -46,6 +46,7 @@













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















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















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













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















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















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















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

































data/etc/privapp-permissions-platform.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -152,6 +152,7 @@ applications that come with the platform













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















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















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













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















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















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















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










@@ -639,6 +640,7 @@ applications that come with the platform













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















        <!-- Permission required for integration test - InputTest -->















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













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















    </privapp-permissions>































    <privapp-permissions package="com.android.soundpicker">