diff options
| author | Bill Yi <byi@google.com> | 2021-01-05 18:27:51 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2021-01-05 18:27:51 -0800 |
| commit | 2dcac1e2a19200589923a236137dded08a98922d (patch) | |
| tree | ce50f637efc1e37b263903a439748fb28fe431d0 /services/companion | |
| parent | bfd05221a3301db98c261fd5b276f904742ac0b2 (diff) | |
| parent | 513c3b5c2987891832363e79cf6fad60c7d0bd61 (diff) | |
Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE
Merged-In: I034d45f1afcdd07c0b12e2db7e4134b695ec5c70
Change-Id: I329407db7c9ed7d2b512e505df6e50c4f471fafa
Diffstat (limited to 'services/companion')
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index a704c58a9b70..66bbf66e88db 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -372,7 +372,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind checkArgument(getCallingUserId() == userId, "Must be called by either same user or system"); - mAppOpsManager.checkPackage(Binder.getCallingUid(), pkg); + int callingUid = Binder.getCallingUid(); + if (mAppOpsManager.checkPackage(callingUid, pkg) != AppOpsManager.MODE_ALLOWED) { + throw new SecurityException(pkg + " doesn't belong to uid " + callingUid); + } } @Override |