summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2020-09-30 10:15:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-30 10:15:21 +0000
commit7a3481c35cce742da424e0ac6b1b165ac948b70b (patch)
treebbff480303d06861689fd47663d3d98c8ab5d2f4 /data
parent32f7c492fcce35394d6f1bfae751b0c5419f95a4 (diff)
parent75ae324fb920e2f0b9d5d704557cc27c70fc4059 (diff)
Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177 am: 75ae324fb9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636 Change-Id: Id9f67ecab2beabe967660b5a4407ef0f20d8efad
Diffstat (limited to 'data')
-rw-r--r--data/etc/privapp-permissions-platform.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 66f9656d95fb..a0ef47e0c67a 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -433,6 +433,8 @@ applications that come with the platform
<permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />
<!-- Permissions required for CTS test - AdbManagerTest -->
<permission name="android.permission.MANAGE_DEBUGGING" />
+ <!-- Permissions required for CTS test - TimeManagerTest -->
+ <permission name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />
</privapp-permissions>
<privapp-permissions package="com.android.statementservice">