diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-09 07:55:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 07:55:37 +0000 |
| commit | 3ab5e586d63dafb1171a13639ef2fe01cfd6a0d3 (patch) | |
| tree | 3b62b6a333d19b1138d868bbe3e6a1ee260424b4 | |
| parent | c332ad6aa81838b3b02f385f639fcedc634ced4a (diff) | |
| parent | c42ea331e09cf3bc3659b418a887e562f0df6dae (diff) | |
| download | base-3ab5e586d63dafb1171a13639ef2fe01cfd6a0d3.tar.gz | |
Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 am: b4fb5feffc am: 12448ab311 am: c759e6a989 am: c42ea331e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346
Change-Id: Icf373d38abed77cd90f9281857c603a7ecbd2539
| -rw-r--r-- | services/core/java/com/android/server/slice/SliceManagerService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/slice/SliceManagerService.java b/services/core/java/com/android/server/slice/SliceManagerService.java index ee0e5ba916b9..e3dcfd0c89c0 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -247,6 +247,8 @@ public class SliceManagerService extends ISliceManager.Stub { if (autoGrantPermissions != null && callingPkg != null) { // Need to own the Uri to call in with permissions to grant. enforceOwner(callingPkg, uri, userId); + // b/208232850: Needs to verify caller before granting slice access + verifyCaller(callingPkg); for (String perm : autoGrantPermissions) { if (mContext.checkPermission(perm, pid, uid) == PERMISSION_GRANTED) { int providerUser = ContentProvider.getUserIdFromUri(uri, userId); |