Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Seth Moore
2022-04-06 13:00:04 +00:00
committed by Automerger Merge Worker
parent 6f6e94088c d690893b54
commit d60f9898e4
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -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 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 RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS"; 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 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 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"; field public static final String START_TASKS_FROM_RECENTS = "android.permission.START_TASKS_FROM_RECENTS";

6
core/res/AndroidManifest.xml
View File

@@ -3409,6 +3409,12 @@
<permission android:name="android.permission.UPDATE_FONTS" <permission android:name="android.permission.UPDATE_FONTS"
android:protectionLevel="signature|privileged" /> 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 --> <!-- Permissions for special development tools -->
<!-- ========================================= --> <!-- ========================================= -->

3
packages/Shell/AndroidManifest.xml
View File

@@ -609,6 +609,9 @@
<!-- Permission required for ATS test - CarDevicePolicyManagerTest --> <!-- Permission required for ATS test - CarDevicePolicyManagerTest -->
<uses-permission android:name="android.permission.LOCK_DEVICE" /> <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" <application android:label="@string/app_label"
android:theme="@android:style/Theme.DeviceDefault.DayNight" android:theme="@android:style/Theme.DeviceDefault.DayNight"
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"