commit 6daeb298427201c814b044d96b99b0aa71a1c9db
author Sterling Huber <hubers@google.com> Tue May 05 21:22:06 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu May 21 08:46:07 2020 +0000
tree f30cdad703b884be5a600801879cd4f902bd798f
parent 44101a23847424741230948070f2732cd8320b03

Revert

This reverts commit 4f7dc13067ab4aa4f0c3f5373ee0a28c0285eea1.

Reason for revert: Reverting based on team discussion from 5/5/20

Bug: 129476618

Change-Id: Iaadc5ce80d8828b3c69bf91e78dd586232c74fc6
(cherry picked from commit ff8fa6c46956f52472502d0d15d50e44c78119bc)

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