diff options
| author | 2023-01-07 00:36:58 +0000 | |
|---|---|---|
| committer | 2023-01-07 00:36:58 +0000 | |
| commit | 1eadb6ed7b20ef8740be1b94e715ce8c8a021029 (patch) | |
| tree | 126aebc4a1a1f28e1ad77df5c8ef87d2a3b6084f | |
| parent | c25019ff07cdd2421788716d8d3cd89a7f8d9586 (diff) | |
| parent | a6bd8b313e2017a8885a170425a7f8776673680b (diff) | |
Merge "Revert "Add permissions to the shell to allow creation of CTS tests for trust." and "Add TRUST_LISTENER to the shell for use in CTS tests"" am: a6bd8b313e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2376789
Change-Id: I2a92a88b49b7eeb75062ee8bfb5e9bcccf89c3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 4 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 8ca16071a1e4..ff42fb52d8e7 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -342,10 +342,6 @@ applications that come with the platform <permission name="android.permission.SET_WALLPAPER_COMPONENT" /> <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT" /> <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" /> - <!-- Permission required for CTS test - TrustTestCases --> - <permission name="android.permission.PROVIDE_TRUST_AGENT" /> - <permission name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> - <permission name="android.permission.TRUST_LISTENER" /> <!-- Permissions required for Incremental CTS tests --> <permission name="com.android.permission.USE_INSTALLER_V2"/> <permission name="android.permission.LOADER_USAGE_STATS"/> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 979e9eaa1e84..f13d961a4647 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -578,11 +578,6 @@ <!-- Permission required for CTS test - PeopleManagerTest --> <uses-permission android:name="android.permission.READ_PEOPLE_DATA" /> - <!-- Permissions required for CTS test - TrustTestCases --> - <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" /> - <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> - <uses-permission android:name="android.permission.TRUST_LISTENER" /> - <!-- Permission required for CTS test - CtsTaskFpsCallbackTestCases --> <uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" /> |