diff options
| author | Joshua Duong <joshuaduong@google.com> | 2020-06-30 00:57:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 00:57:37 +0000 |
| commit | b47d1e610072afe2209ca57bc3e1fe5373fbb2f4 (patch) | |
| tree | 6a6d8b10712fc6a1a4d9cc56cddcbee80ffa1413 /packages/Shell | |
| parent | f30f3effddc650e2a0f7654277901b6a808890ea (diff) | |
| parent | 5ab3aa0c7b913079e1a8146d347faf66c49761a3 (diff) | |
Merge changes from topic "adbwifi-cts" into rvc-dev am: 5ab3aa0c7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12000446
Change-Id: I27c6493f075ace2e9c12f9b7f359f42ccbb1406f
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 9cecd52217a9..d50dc7cba52b 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -314,6 +314,9 @@ <!-- Permissions required for GTS test - GtsDialerAudioTestCases --> <uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" /> + <!-- Permissions required for CTS test - AdbManagerTest --> + <uses-permission android:name="android.permission.MANAGE_DEBUGGING" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |