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

Commit e3be17ae authored by Omer Ozer's avatar Omer Ozer Committed by Android (Google) Code Review
Browse files

Merge "Add a new system level permission that will allow a system app to track... 

Merge "Add a new system level permission that will allow a system app to track factory reset preparation updates such as backing up of application data for existing apps on the device." into main
parents a0510702 2fa6ded1

core/api/system-current.txt

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

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

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

    field @FlaggedApi("android.permission.flags.factory_reset_prep_permission_apis") public static final String PREPARE_FACTORY_RESET = "android.permission.PREPARE_FACTORY_RESET";

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

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

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

core/java/android/permission/flags.aconfig

+8 −1
Original line number Diff line number Diff line
@@ -57,3 +57,10 @@ flag { 
  description: "enables logging of the OP_ENABLE_MOBILE_DATA_BY_USER"

  bug: "222650148"

}



flag {

  name: "factory_reset_prep_permission_apis"

  namespace: "wallet_integration"

  description: "enable Permission PREPARE_FACTORY_RESET."

  bug: "302016478"

}

core/res/AndroidManifest.xml

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

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows an app to track all preparations for a complete factory reset.

     <p>Protection level: signature|privileged

     @FlaggedApi("android.permission.flags.factory_reset_prep_permission_apis")

     @hide -->

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

        android:protectionLevel="signature|privileged" />



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

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

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