diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 02:15:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 02:15:13 +0000 |
| commit | 23f9ef4d2bd5146584b258a3761430e52e44fe93 (patch) | |
| tree | 29c532ccf43cdd2af7ee481d582f4ac13cc236a6 | |
| parent | d6c0a357ab30b061ea54ebd79ab58eeb8f78d06b (diff) | |
| parent | 7342dafaa5bd46215267903d008dc59523e192e9 (diff) | |
Merge "Adding a permission to Shell for testing" am: 7342dafaa5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679721
Change-Id: I8d412d08c63660956b282566ef3ecd09add58c12
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index 460eca2a5a34..62e11b9baca2 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -469,6 +469,8 @@ applications that come with the platform <permission name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" /> <permission name="android.permission.SET_MEDIA_KEY_LISTENER" /> <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" /> + <!-- Permission required for CTS test - CtsAlarmManagerTestCases --> + <permission name="android.permission.UPDATE_DEVICE_STATS" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 7b7bec721627..760941220869 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -462,6 +462,9 @@ <!-- Permission required for CTS test - CtsUwbTestCases --> <uses-permission android:name="android.permission.UWB_PRIVILEGED" /> + <!-- Permission required for CTS test - CtsAlarmManagerTestCases --> + <uses-permission android:name="android.permission.UPDATE_DEVICE_STATS" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |