diff options
| author | Sergey Nikolaienkov <sergeynv@google.com> | 2020-09-09 07:57:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 07:57:43 +0000 |
| commit | 4bf2a8e322a4ad7859afe9adc94913bfef47a44b (patch) | |
| tree | 3190e5a1a662ebeb94dbe8022744c2cce6d1bda1 /packages/Shell | |
| parent | ee81b81b293853e881ba456602ca6b093837ccb0 (diff) | |
| parent | ec82033d3ec16c0946ccdf99bf6ba20ecf7ac97c (diff) | |
Merge "Add GET_INTENT_SENDER_INTENT permission to Shell" am: 104d2f92b3 am: ec82033d3e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1385856
Change-Id: I3a835c92cf86985d6861382f33c58d5df000f2d7
Diffstat (limited to 'packages/Shell')
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 319b44ce216f..190015cebe30 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -217,6 +217,9 @@ <!-- Permission needed for CTS test - UnsupportedErrorDialogTests --> <uses-permission android:name="android.permission.RESET_APP_ERRORS" /> + <!-- Permission needed for CTS test - CtsSystemUiTestCases:PipNotificationTests --> + <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" /> + <!-- Permission needed to run keyguard manager tests in CTS --> <uses-permission android:name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS" /> |