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)
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 0fff075..7b95d92 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 19eac7c..da139d7 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 067becb..54a3ecb 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 @@
+ "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) {
