commit 3772a38d7058f23f3fd9f812dbbac23174cd96f1
author Eugene Susla <eugenesusla@google.com> Fri Mar 29 16:14:02 2019 -0700
committer JP Sugarbroad <jpsugar@google.com> Tue Jun 16 16:35:59 2020 +0000
tree f2b7df66560e10a7faf8583ec92a9d77778e888c
parent dfb1f99f9d6c114529ccc874de6541f2f148da7e

RESTRICT AUTOMERGE
Prevent accessing companion records from arbitrary uids

Relanding after previous revert.

Test: manual
Bug: 129476618
Change-Id: Ia906d2e16fa8b00eda0a00e622cc21e29fb90481
(cherry picked from commit 8643636095dc9b3c70a62ef16f68df12dff67fe7)
(cherry picked from commit acd10b237c5b5652bfb657c051f15eeed2931b2f)

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 b23c6ab..fd82e07 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -2834,6 +2834,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