commit 3d7824642d944a9a4110c64152c5fce8ce8b0c60
author Sterling Huber <hubers@google.com> Wed May 20 15:58:28 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 21 08:46:14 2020 +0000
tree a58d8958a4c17570a69efe31279f1feee3025db1
parent 270e6734331112d65e43c8aa43e068fff5506a15

Revert "Revert"

This reverts commit ff8fa6c46956f52472502d0d15d50e44c78119bc.

Reason for revert: Reverting revert based on team discussions

Change-Id: Ied0463a75e56f489227561f68c890b05cd8dfc97
(cherry picked from commit aa2fbd31457323abeb2e534376dd60ad277ff716)

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 a2e044a..f93376d 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -3466,6 +3466,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