diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-29 16:57:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-29 16:57:01 +0000 |
| commit | 69a09397647eabe8cab888186963560726f984ad (patch) | |
| tree | ca7d6b8fae6a82884f9f5e8cd4eac33d8b82de7b | |
| parent | 4f25b8822ec04ae61918e15b4586c367369f5b4b (diff) | |
| parent | 1f5ef8e31d365210ce1d7cf91a7717b0a5d9b43c (diff) | |
Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev
| -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 12eb50e5bee0..6385952fe884 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -496,6 +496,8 @@ applications that come with the platform <permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" /> <!-- Permission required for CTS test - CtsAlarmManagerTestCases --> <permission name="android.permission.UPDATE_DEVICE_STATS" /> + <!-- Permission required for GTS test - PendingSystemUpdateTest --> + <permission name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> </privapp-permissions> <privapp-permissions package="com.android.statementservice"> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 491f0d9f615f..c7b50c22b8c1 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -568,6 +568,9 @@ <!-- Permission required for CTS test - GlobalSearchSessionPlatformCtsTests --> <uses-permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA" /> + <!-- Permission required for GTS test - PendingSystemUpdateTest --> + <uses-permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |