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

Commit ca0eb3a3 authored by Mengqi Yang's avatar Mengqi Yang Committed by Android (Google) Code Review
Browse files

Merge "Add backup and restore permissions and declare the certificate arrays" into main

parents 38569bd5 08c42321

core/api/system-current.txt

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

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

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

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

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

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

    field public static final String BIND_ATTENTION_SERVICE = "android.permission.BIND_ATTENTION_SERVICE";
@@ -347,6 +348,7 @@ package android { 
    field public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE";

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

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

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

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

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

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

core/res/AndroidManifest.xml

+20 −0
Original line number Diff line number Diff line
@@ -8335,6 +8335,26 @@ 
        android:protectionLevel="signature|knownSigner"

        android:knownCerts="@array/config_healthConnectMigrationKnownSigners" />



    <!-- @hide @SystemApi Allows permitted apps to back up Health Connect data and settings.

             <p>Protection level: signature|knownSigner

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

    -->

    <permission

        android:name="android.permission.BACKUP_HEALTH_CONNECT_DATA_AND_SETTINGS"

        android:protectionLevel="signature|knownSigner"

        android:knownCerts="@array/config_backupHealthConnectDataAndSettingsKnownSigners"

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



    <!-- @hide @SystemApi Allows permitted apps to restore Health Connect data and settings.

             <p>Protection level: signature|knownSigner

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

    -->

    <permission

        android:name="android.permission.RESTORE_HEALTH_CONNECT_DATA_AND_SETTINGS"

        android:protectionLevel="signature|knownSigner"

        android:knownCerts="@array/config_restoreHealthConnectDataAndSettingsKnownSigners"

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



    <!-- @SystemApi Allows an app to query apps in clone profile. The permission is

         bidirectional in nature, i.e. cloned apps would be able to query apps in root user.

         The permission is not meant for 3P apps as of now.

core/res/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -7005,6 +7005,15 @@ 
    <string-array name="config_healthConnectMigrationKnownSigners">

    </string-array>



    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner

         permission for backing up HealthConnect's data and settings. The digest should be computed over the

         DER encoding of the trusted certificate using the SHA-256 digest algorithm. -->

    <string-array name="config_backupHealthConnectDataAndSettingsKnownSigners"/>

    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner

         permission for restoring HealthConnect's data and settings. The digest should be computed over the

         DER encoding of the trusted certificate using the SHA-256 digest algorithm. -->

    <string-array name="config_restoreHealthConnectDataAndSettingsKnownSigners"/>



    <!-- Package name of Health Connect data migrator application.  -->

    <string name="config_healthConnectMigratorPackageName"></string>