diff options
| author | 2022-04-05 02:27:51 +0000 | |
|---|---|---|
| committer | 2022-04-05 02:27:51 +0000 | |
| commit | b59b661eb7928bbcf3e824e93660322f810c1654 (patch) | |
| tree | 72a5468f960bfe4d8db1e11c1ea519fcd5d829e7 | |
| parent | f7a66523ae3ae9dd726bb7f6589373b174e69d69 (diff) | |
| parent | a2df99e5eb11bf136f4ae0092ec7075500c2f86d (diff) | |
Merge "Allow Shell to have permission for CTS." into tm-dev am: a2df99e5eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17508836
Change-Id: Icfbf9844bb4bf65b6c3a39b1b7325e1290a4e238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 1 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 449fb0242d09..58a2073981bf 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -273,6 +273,7 @@ applications that come with the platform <permission name="android.permission.LOCAL_MAC_ADDRESS"/> <permission name="android.permission.MANAGE_ACCESSIBILITY"/> <permission name="android.permission.MANAGE_DEVICE_ADMINS"/> + <permission name="android.permission.ACCESS_FPS_COUNTER"/> <permission name="android.permission.MANAGE_GAME_MODE"/> <permission name="android.permission.MANAGE_GAME_ACTIVITY" /> <permission name="android.permission.MANAGE_LOW_POWER_STANDBY" /> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index a10ca9e75355..a28c4cf6b0d4 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -575,6 +575,9 @@ <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" /> + <!-- Permission required for CTS test - CtsGameManagerTestCases --> <uses-permission android:name="android.permission.MANAGE_GAME_MODE" /> |