| commit | 2c54e6259abb672b9cca82384c27f18efd4a6299 | [log] [tgz] |
|---|---|---|
| author | Eugene Susla <eugenesusla@google.com> | Thu Nov 05 20:45:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Nov 05 20:45:37 2020 +0000 |
| tree | f7a6096dbb05355d4b73e813180fa88c57a9d054 | |
| parent | 83739b6db95d1e6938b8283363c576ab99e1a3b2 [diff] | |
| parent | 6b6c1353802b9f643ac2363314b6d2752a3cade0 [diff] |
RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12950101 Change-Id: I2d4bc8b16fe0a709a8a4560a4e685e98c89e570d
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index aaa4626..6dce7ee 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -25,6 +25,7 @@ import android.Manifest; import android.annotation.CheckResult; import android.annotation.Nullable; +import android.app.AppOpsManager; import android.app.PendingIntent; import android.companion.AssociationRequest; import android.companion.CompanionDeviceManager; @@ -275,7 +276,10 @@ 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