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

Merge "Add permissions to the shell to allow creation of CTS tests for trust." am: 139e007dc5 am: d9b1d582b4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955633

Change-Id: I51843ba8e7426a0a86f7227acba97051706e86f6
This commit is contained in:
Treehugger Robot
2022-01-21 13:47:08 +00:00
committed by Automerger Merge Worker
parent 2e39612bb2 d9b1d582b4
commit 6ce69e06a3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,9 @@ applications that come with the platform
<permission name="android.permission.SET_WALLPAPER" /> <permission name="android.permission.SET_WALLPAPER" />
<permission name="android.permission.SET_WALLPAPER_COMPONENT" /> <permission name="android.permission.SET_WALLPAPER_COMPONENT" />
<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" />
<!-- 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"/>

4
packages/Shell/AndroidManifest.xml
View File

@@ -528,6 +528,10 @@
<!-- 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" />
<!-- Permission required for CTS test - CtsGameManagerTestCases --> <!-- Permission required for CTS test - CtsGameManagerTestCases -->
<uses-permission android:name="android.permission.MANAGE_GAME_MODE" /> <uses-permission android:name="android.permission.MANAGE_GAME_MODE" />