diff options
| author | 2023-05-02 17:52:09 +0000 | |
|---|---|---|
| committer | 2023-05-02 17:52:09 +0000 | |
| commit | 0cbc1d67c8d1cd56a334b4e17efa2f0bcf4b01e2 (patch) | |
| tree | b3a80aa07317a2fc78820a527580809cbc471b24 | |
| parent | 5d749cebda3f5b430a5981a317c2e573f8291ef9 (diff) | |
| parent | b83632d391d0525933ae189cc0bf073a47be3647 (diff) | |
Merge "Add USE_ATTESTATION_VERIFICATION_SERVICE permission to shell for GTS test" into udc-dev am: 30d70c98fb am: b83632d391
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22759014
Change-Id: I8d7d5e7766eb82f8912ad56640cac7ae723f1d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 40cb7f2194e9..20a43fc1beb0 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -520,6 +520,8 @@ applications that come with the platform <permission name="android.permission.SOUND_TRIGGER_RUN_IN_BATTERY_SAVER"/> <!-- Permission required for CTS test - SatelliteManagerTest --> <permission name="android.permission.SATELLITE_COMMUNICATION"/> + <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases --> + <permission name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index a110f56d09bd..34a2ce34738d 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -834,6 +834,9 @@ <uses-permission android:name="android.permission.LOG_FOREGROUND_RESOURCE_USE"/> + <!-- Permission required for GTS test - GtsAttestationVerificationDeviceSideTestCases --> + <uses-permission android:name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |