diff options
| author | 2022-04-06 13:00:04 +0000 | |
|---|---|---|
| committer | 2022-04-06 13:00:04 +0000 | |
| commit | d60f9898e4a0d7be82ae58b31f72ef25509f56ab (patch) | |
| tree | 122a1e719fae700f9d34a01e721be8e957f512ad | |
| parent | 6f6e94088cb962c64d4922bce0f175a89d5acfa4 (diff) | |
| parent | d690893b54878f9c72660cd38c577c47b5045af4 (diff) | |
Merge "Add new privileged permission for unique id attestation" am: d690893b54
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049992
Change-Id: I572f6e3573f054ef20dc01d0d9190eb5e2d23435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 252ca4d7c855..bfbb9105dbb8 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 659790b84ee3..d8673fe70550 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -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 --> <!-- ========================================= --> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index c03ed0323bec..208bfbbfcbff 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -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" |