diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-22 23:08:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-22 23:08:04 +0000 |
| commit | f96b3c9b7e4c69c1fddbc5c9ccb1b649a8e3a1dd (patch) | |
| tree | 6146981e495055aeab8abeff8afb21d55946e676 | |
| parent | 19227edee1e7472ab3861eeba051cf635741cd09 (diff) | |
| parent | 19717519e5a9c2d6afc4cc2f1340f059cdca1070 (diff) | |
| download | base-f96b3c9b7e4c69c1fddbc5c9ccb1b649a8e3a1dd.tar.gz | |
Merge cherrypicks of [11219356] into qt-d4-release
Change-Id: I8d19cb41b0d01bcd79465f850a2d86a90d625fc5
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 7b95d92ce1d6..0fff075b961d 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3530,6 +3530,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 diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index da139d74f8ae..19eac7ccdb02 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -181,6 +181,7 @@ <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 54a3ecb22687..067becbf0c52 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -660,6 +660,11 @@ 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) { |