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

Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3

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

Change-Id: Ia3343e4f04533f59f56e0e02464f354fa1230418
This commit is contained in:
Neil Fuller
2021-05-19 16:24:03 +00:00
committed by Automerger Merge Worker
parent 423ee1c59f bc9061fdf3
commit 17ba82b205
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,6 +440,7 @@ applications that come with the platform
<permission name="android.permission.MANAGE_DEBUGGING" /> <permission name="android.permission.MANAGE_DEBUGGING" />
<!-- Permissions required for CTS test - TimeManagerTest --> <!-- Permissions required for CTS test - TimeManagerTest -->
<permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
<permission name="android.permission.SUGGEST_EXTERNAL_TIME" />
<!-- Permissions required for CTS test - android.server.biometrics --> <!-- Permissions required for CTS test - android.server.biometrics -->
<permission name="android.permission.USE_BIOMETRIC" /> <permission name="android.permission.USE_BIOMETRIC" />
<permission name="android.permission.TEST_BIOMETRIC" /> <permission name="android.permission.TEST_BIOMETRIC" />

3
packages/Shell/AndroidManifest.xml
View File

@@ -455,8 +455,9 @@
<!-- Permission needed for CTS test - MatchContentFrameRateTest --> <!-- Permission needed for CTS test - MatchContentFrameRateTest -->
<uses-permission android:name="android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE" /> <uses-permission android:name="android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE" />
<!-- Permission needed for CTS test - TimeManagerTest --> <!-- Permissions needed for CTS test - TimeManagerTest -->
<uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> <uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
<uses-permission android:name="android.permission.SUGGEST_EXTERNAL_TIME" />
<!-- Permission required for CTS test - android.server.biometrics --> <!-- Permission required for CTS test - android.server.biometrics -->
<uses-permission android:name="android.permission.USE_BIOMETRIC" /> <uses-permission android:name="android.permission.USE_BIOMETRIC" />