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

Merge "Add TRUST_LISTENER to the shell for use in CTS tests" am: f4a4508e64

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

Change-Id: Ifc9c639a0366cfa9e0746752a0bb9b99f5805c78
This commit is contained in:
Dave McCloskey
2022-02-04 23:10:48 +00:00
committed by Automerger Merge Worker
parent 9da79d3727 f4a4508e64
commit 9845deb4e9
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,6 +393,7 @@ applications that come with the platform
<!-- Permission required for CTS test - TrustTestCases --> <!-- Permission required for CTS test - TrustTestCases -->
<permission name="android.permission.PROVIDE_TRUST_AGENT" /> <permission name="android.permission.PROVIDE_TRUST_AGENT" />
<permission name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> <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"/>

1
packages/Shell/AndroidManifest.xml
View File

@@ -536,6 +536,7 @@
<!-- Permissions required for CTS test - TrustTestCases --> <!-- Permissions required for CTS test - TrustTestCases -->
<uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT" /> <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.ACCESS_KEYGUARD_SECURE_STORAGE" />
<uses-permission android:name="android.permission.TRUST_LISTENER" />
<!-- 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" />