From 5202f51bfa6a42086ed785a592195d6edef9ae29 Mon Sep 17 00:00:00 2001
From: Judy Chen <judytzchen@google.com>
Date: Thu, 23 Apr 2020 03:24:35 +0000
Subject: Revert "Merge cherrypicks of [11219356] into qt-d4-release"

This reverts commit f96b3c9b7e4c69c1fddbc5c9ccb1b649a8e3a1dd.

Reason for revert: <INSERT REASONING HERE>
The change is for June Security patch but S5 has already lockdown May Security patch for launch.
S5 will have arranged July SMR after launch.

Change-Id: I1f1cab5890b75012dba119717baaf5cca6c87e9c
(cherry picked from commit 75fc007d66c23415bedc8e2e54db851dfbd3a215)
---
 core/res/AndroidManifest.xml                                         | 5 -----
 packages/Shell/AndroidManifest.xml                                   | 1 -
 .../com/android/server/companion/CompanionDeviceManagerService.java  | 5 -----
 3 files changed, 11 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0fff075b961d..7b95d92ce1d6 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3530,11 +3530,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
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 19eac7ccdb02..da139d74f8ae 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -181,7 +181,6 @@
     <uses-permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND" />
     <!-- Permission needed to wipe the device for Test Harness Mode -->
     <uses-permission android:name="android.permission.ENABLE_TEST_HARNESS_MODE" />
-    <uses-permission android:name="android.permission.MANAGE_COMPANION_DEVICES" />
 
     <uses-permission android:name="android.permission.MANAGE_APPOPS" />
 
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index 067becbf0c52..54a3ecb22687 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -660,11 +660,6 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
                 + "associate USER_ID PACKAGE MAC_ADDRESS\n"
                 + "disassociate USER_ID PACKAGE MAC_ADDRESS";
 
-        ShellCmd() {
-            getContext().enforceCallingOrSelfPermission(
-                    android.Manifest.permission.MANAGE_COMPANION_DEVICES, "ShellCmd");
-        }
-
         @Override
         public int onCommand(String cmd) {
             switch (cmd) {
-- 
cgit v1.2.3