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

Commit 9a1aff72 authored by Jan Tomljanovic's avatar Jan Tomljanovic Committed by Android (Google) Code Review
Browse files

Merge "Update protection level for MANAGE_SAFETY_CENTER permission" into main

parents 4a8d8b6b d6009158

core/res/AndroidManifest.xml

+11 −1
Original line number Diff line number Diff line
@@ -8750,7 +8750,17 @@ 
             @hide

        -->

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

                android:protectionLevel="internal|installer|role" />

                android:protectionLevel="internal|installer|role"

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













    <!-- @SystemApi Required to access the safety center internal APIs using the













             {@link android.safetycenter.SafetyCenterManager}.













             <p>Protection level: signature|privileged













             @hide













        -->













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













                android:protectionLevel="signature|privileged"













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





























    <!-- @SystemApi Allows an application to access the AmbientContextEvent service.















         @hide

































data/etc/com.android.settings.xml



+1
−0




























Original line number
Diff line number
Diff line








@@ -70,5 +70,6 @@













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















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















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













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















    </privapp-permissions>















</permissions>
























data/etc/privapp-permissions-platform.xml



+2
−0




























Original line number
Diff line number
Diff line








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













        <!-- Permissions required for CTS test - CtsSafetyCenterTestCases -->















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















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













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















        <!-- Permission required for CTS test - CtsTelephonyTestCases -->















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















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










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













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















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















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













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















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















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















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