diff options
| author | Eugene Susla <eugenesusla@google.com> | 2020-11-05 20:45:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-05 20:45:40 +0000 |
| commit | bbe7a90031b754379aa834ecf812fbf9f3ee5ea4 (patch) | |
| tree | 46e03f709bdf9a95f45452ee9ef64f59b2c61125 /services/companion | |
| parent | 8140a06a287ffafce2746c60af094f9037ad73c7 (diff) | |
| parent | 392a927cefb52681ccb43721654dd257f5ba4897 (diff) | |
RESTRICT AUTOMERGE am: 30b022a8d2 am: 392a927cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939924
Change-Id: Ide22b7aad882e5f2613b636d6ac8809e302dba99
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 |