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

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

Browse Source 
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>
This commit is contained in:
Paul Crowley
2023-01-07 00:36:58 +00:00
committed by Automerger Merge Worker
parent c25019ff07 a6bd8b313e
commit 1eadb6ed7b
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/etc/privapp-permissions-platform.xml
View File

@@ -342,10 +342,6 @@ applications that come with the platform
<permission name="android.permission.SET_WALLPAPER_COMPONENT" /> <permission name="android.permission.SET_WALLPAPER_COMPONENT" />
<permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT" /> <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT" />
<permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE" /> <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 --> <!-- Permissions required for Incremental CTS tests -->
<permission name="com.android.permission.USE_INSTALLER_V2"/> <permission name="com.android.permission.USE_INSTALLER_V2"/>
<permission name="android.permission.LOADER_USAGE_STATS"/> <permission name="android.permission.LOADER_USAGE_STATS"/>

5
packages/Shell/AndroidManifest.xml
View File

@@ -578,11 +578,6 @@
<!-- Permission required for CTS test - PeopleManagerTest --> <!-- Permission required for CTS test - PeopleManagerTest -->
<uses-permission android:name="android.permission.READ_PEOPLE_DATA" /> <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 --> <!-- Permission required for CTS test - CtsTaskFpsCallbackTestCases -->
<uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" /> <uses-permission android:name="android.permission.ACCESS_FPS_COUNTER" />