diff options
| author | Neil Fuller <nfuller@google.com> | 2020-09-30 09:35:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-30 09:35:03 +0000 |
| commit | 8a0ce64177e876f38d4d2570119859fa89af11d0 (patch) | |
| tree | 9ac8448080355de76ee3a60329ea48d297cfba18 /packages/Shell | |
| parent | 5d8e5249d6676a061ea911dda1f40ad581acdbec (diff) | |
| parent | 1f728acac05a53370f9eacc770de18d407c191a3 (diff) | |
Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636
Change-Id: I2a65d7c9a91f5b3f5772ba8b2b199bfe3096077b
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 f5f58efb72e6..a9279971ce1e 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -326,6 +326,9 @@ <!-- Permission needed for CTS test - DisplayTest --> <uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" /> + <!-- Permission needed for CTS test - TimeManagerTest --> + <uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" /> + <application android:label="@string/app_label" android:theme="@android:style/Theme.DeviceDefault.DayNight" android:defaultToDeviceProtectedStorage="true" |