diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-04-01 21:10:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-01 21:10:24 +0000 |
| commit | bfb6efe93a841819193f2a14cd94b8b01033b177 (patch) | |
| tree | 5272431b1e12c2845a890c6473b707db1c05a643 /services/companion | |
| parent | a6d3c97f66c32417300c03ef42e4a293c5c00530 (diff) | |
| parent | 6015cb062b36b952ab4c081b7246593ce4872f4b (diff) | |
RESTRICT AUTOMERGE am: b4aaa9d8ad am: 6015cb062b
Change-Id: I0a679eb49f46041f39edc7f3f166eaef4ffb1c1c
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |