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

Commit 64b79f38 authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Define permssion configs for HC migration API"

parents e4829301 9c62bea0

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -6893,6 +6893,12 @@ 
    <permission android:name="android.permission.GET_APP_METADATA"

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows the holder to call health connect migration APIs.

        @hide -->

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

        android:protectionLevel="signature|knownSigner"

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



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

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

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

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -6118,4 +6118,9 @@ 
        <item>@string/config_mainDisplayShape</item>

        <item>@string/config_secondaryDisplayShape</item>

    </string-array>

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

        Connect Migration permissions. The digest should be computed over the DER encoding of the

        trusted certificate using the SHA-256 digest algorithm. -->

    <string-array name="config_healthConnectMigrationKnownSigners">

    </string-array>

</resources>

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


        <!-- Standard permissions granted to the shell. -->

    <uses-permission android:name="android.permission.MANAGE_HEALTH_DATA" />

    <uses-permission android:name="android.permission.MIGRATE_HEALTH_CONNECT_DATA" />

    <uses-permission android:name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP" />

    <uses-permission android:name="android.permission.GET_RUNTIME_PERMISSIONS" />

    <uses-permission android:name="android.permission.SEND_SMS" />