diff options
| author | 2020-11-05 20:27:37 +0000 | |
|---|---|---|
| committer | 2020-11-05 20:27:37 +0000 | |
| commit | f33b6e4cb9d82052ed97034d9f865a63ac3340ef (patch) | |
| tree | 3c98786a09472d6502f159f06a4b4c1e65f9de57 | |
| parent | 512c41b92f51cc20ddfc4fb23a8e2070d868eedd (diff) | |
| parent | 30b022a8d207573aeaf735a33439884afe60c684 (diff) | |
RESTRICT AUTOMERGE am: 30b022a8d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939924
Change-Id: Ia5b51dc545adc67d368f31ec1b3d91cb1c90ac61
| -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 d6759b3e2cca..29fc1674bab9 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 |