diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-04 01:38:55 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-04 01:38:55 +0000 |
commit | 9cc6a83ee82ba3858859c3740ee62eeb2855cf9b (patch) | |
tree | 1af0e4b559306e5494f2952acc98f6eb9a41e15d | |
parent | fe01970c8f91a6b8035b9e6e98d29f031611d48b (diff) | |
parent | acd10b237c5b5652bfb657c051f15eeed2931b2f (diff) | |
download | cts-9cc6a83ee82ba3858859c3740ee62eeb2855cf9b.tar.gz |
Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into oreo-cts-dev
-rw-r--r-- | tests/tests/permission2/res/raw/android_manifest.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml index 6050776ba08..91c155027fe 100644 --- a/tests/tests/permission2/res/raw/android_manifest.xml +++ b/tests/tests/permission2/res/raw/android_manifest.xml @@ -2724,6 +2724,11 @@ <permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" android:protectionLevel="signature|privileged" /> + <!-- Allows an application to manage the companion devices. + @hide --> + <permission android:name="android.permission.MANAGE_COMPANION_DEVICES" + android:protectionLevel="signature" /> + <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features. <p>Not for use by third-party applications. @hide |