diff options
| author | Sergey Nikolaienkov <sergeynv@google.com> | 2020-07-22 06:51:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 06:51:45 +0000 |
| commit | 71f8e0fbc2a7418f736fd6ee8a9c4292d9530c5a (patch) | |
| tree | 0419bf3939aa5bab571042b1f0e1dca8a406cd2a /packages/Shell | |
| parent | 269b829684bb93774c59bd708e2d285f27ebaf87 (diff) | |
| parent | f453a23f6aa2e5d01b6eef1e50af1fb166c95d75 (diff) | |
Merge "Make Shell require permission for a new CTS test" am: e3548b2259 am: f453a23f6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702
Change-Id: Id65701e738cd523032166eb48e1aba052f55defa
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 d50dc7cba52b..319b44ce216f 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -214,6 +214,9 @@ <!-- Permission needed to test tcp keepalive offload. --> <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" /> + <!-- Permission needed for CTS test - UnsupportedErrorDialogTests --> + <uses-permission android:name="android.permission.RESET_APP_ERRORS" /> + <!-- Permission needed to run keyguard manager tests in CTS --> <uses-permission android:name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS" /> |