commit 4f7dc13067ab4aa4f0c3f5373ee0a28c0285eea1
author Eugene Susla <eugenesusla@google.com> Fri Mar 29 16:14:02 2019 -0700
committer Sterling Huber <hubers@google.com> Mon Mar 16 14:52:29 2020 -0700
tree 16d38c2f0ca6bf2bbd4f24c7e5f9b43e9ada1dab
parent dd4a1ab34502f4b76a2366dabf02b6a0595e02ef

RESTRICT AUTOMERGE
Prevent accessing companion records from arbitrary uids

Test: manual
Bug: 129476618
Change-Id: Icc713def6192401b1aedeb4c0eb2a7ca021440a0

tests/tests/permission2/res/raw/android_manifest.xml

diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index d43b866..e1bb976 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -3457,6 +3457,11 @@
     <permission android:name="android.permission.OBSERVE_ROLE_HOLDERS"
         android:protectionLevel="signature|installer" />
 
+    <!-- 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