| commit | f453a23f6aa2e5d01b6eef1e50af1fb166c95d75 | [log] [tgz] |
|---|---|---|
| author | Sergey Nikolaienkov <sergeynv@google.com> | Wed Jul 22 06:39:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 22 06:39:01 2020 +0000 |
| tree | 60943e0452269017c6d4167ec1d789798ac58bea | |
| parent | 0796fa5254d57dd88dd00a9cdebfa7a9ef68a6ea [diff] | |
| parent | e3548b22594b4bdb0d218178b8f362ab644930b2 [diff] |
Merge "Make Shell require permission for a new CTS test" am: e3548b2259 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356702 Change-Id: If1c63eb9bff844be0b35cd2400ff683bd566a239
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 3b48c1d1..f247166 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml
@@ -198,6 +198,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" />