diff options
| author | Eugene Susla <eugenesusla@google.com> | 2019-03-28 13:50:17 -0700 |
|---|---|---|
| committer | Sterling Huber <hubers@google.com> | 2020-03-16 14:15:22 -0700 |
| commit | b4aaa9d8adae5971f7f6589afc22008afa2f8d2b (patch) | |
| tree | b9122ba1e2baf24c0add2623ec491420bdb98395 /services/companion | |
| parent | 3d4cf3468533db2e0cbe7e01c4325d8b3f93e2a2 (diff) | |
RESTRICT AUTOMERGE
Prevent accessing companion records from arbitrary uids
Test: manual
Fixes: 129476618
Change-Id: I7b18cfcdf58e62a445cbb508116c6ce7c1cea8d7
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) { |