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

Commit d60f9898 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Add new privileged permission for unique id attestation" am: d690893b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049992



Change-Id: I572f6e3573f054ef20dc01d0d9190eb5e2d23435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f6e9408 d690893b

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,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 SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS = "android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS";

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

core/res/AndroidManifest.xml

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

        android:protectionLevel="signature|privileged" />



    <!-- 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
@@ -609,6 +609,9 @@ 
    <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->

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



    <!-- 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"