diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-09 17:15:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-09 17:15:44 +0000 |
| commit | 57fcc33111d15b8d0efd47fec18895e4a468952b (patch) | |
| tree | 8d4503f31ce8516a7714ed4054bf8cf143c1f43c | |
| parent | aea31157762641c3807098bb356c3d4cb9956a1e (diff) | |
| parent | 46e5c0df766084d489da300fb4d03330a4792340 (diff) | |
Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" into sc-dev
| -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 240d0565bddb..04291e3dcc5c 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -488,6 +488,7 @@ applications that come with the platform <permission name="android.permission.BRIGHTNESS_SLIDER_USAGE" /> <permission name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" /> <permission name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" /> + <permission name="android.permission.GET_TOP_ACTIVITY_INFO" /> <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" /> diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index bcb21d1d64ce..959b5ca56687 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -526,6 +526,9 @@ <!-- Permission required for CTS test - FontManagerTest --> <uses-permission android:name="android.permission.UPDATE_FONTS" /> + <!-- Permission required for Launcher testing - DigitalWellbeingToastTest --> + <uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO"/> + <!-- Permission required for hotword detection service CTS tests --> <uses-permission android:name="android.permission.MANAGE_HOTWORD_DETECTION" /> <uses-permission android:name="android.permission.BIND_HOTWORD_DETECTION_SERVICE" /> |