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

Commit 14e9f410 authored by Seth Moore's avatar Seth Moore Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Add new privileged permission for unique id attestation" into tm-dev

parents 72c69ad2 4d8825e4

core/api/test-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

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

                android:protectionLevel="signature" />



    <!-- Allows the caller to generate keymint keys with the INCLUDE_UNIQUE_ID tag, which

         uniquely identifies the device via the attestation certificate.

         @hide @TestApi -->

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

         android:protectionLevel="signature" />



    <!-- ========================================= -->

    <!-- Permissions for special development tools -->

    <!-- ========================================= -->

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -674,6 +674,9 @@ 
    <!-- Permission required for CTS test - CtsAppEnumerationTestCases -->

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



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

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



    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"