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

Commit 75f3dc47 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add config value and a new permission for SafetyCenter."

parents 0314f028 8066d1ef

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ package android { 
    field public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";

    field public static final String READ_PROJECTION_STATE = "android.permission.READ_PROJECTION_STATE";

    field public static final String READ_RUNTIME_PROFILES = "android.permission.READ_RUNTIME_PROFILES";

    field public static final String READ_SAFETY_CENTER_STATUS = "android.permission.READ_SAFETY_CENTER_STATUS";

    field public static final String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES";

    field public static final String READ_SYSTEM_UPDATE_INFO = "android.permission.READ_SYSTEM_UPDATE_INFO";

    field public static final String READ_WALLPAPER_INTERNAL = "android.permission.READ_WALLPAPER_INTERNAL";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -6071,6 +6071,13 @@ 
    <permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES"

                android:protectionLevel="signature|role" />

    

    <!-- @SystemApi Allows an app to read whether SafetyCenter is enabled/disabled.

             <p>Protection level: signature|privileged

             @hide

        -->

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

        android:protectionLevel="signature|privileged" />



    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -5550,4 +5550,7 @@ 
         That button will fire an intent targeted for this package with the mentioned action.

         When this resource is empty, that button will not be shown. -->

    <string name="config_supervisedUserCreationPackage" translatable="false"></string>



    <!-- Determines whether SafetyCenter feature is enabled. -->

    <bool name="config_enableSafetyCenter">true</bool>

</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -4634,4 +4634,6 @@ 
  <java-symbol type="string" name="config_systemGameService" />



  <java-symbol type="string" name="config_supervisedUserCreationPackage"/>



  <java-symbol type="bool" name="config_enableSafetyCenter" />

</resources>

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ applications that come with the platform 
        <permission name="android.permission.LOCK_DEVICE" />

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

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

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

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

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

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

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