diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-09 07:21:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 07:21:39 +0000 |
| commit | c42ea331e09cf3bc3659b418a887e562f0df6dae (patch) | |
| tree | 235ffc71b4762457e94ffe8f7b44796f26b1becd | |
| parent | 2964f715c83bc738c1665bb3c2a0bdaa8d338378 (diff) | |
| parent | c759e6a989843cdd38c255b5d0edaef8e3a2f5ea (diff) | |
| download | base-c42ea331e09cf3bc3659b418a887e562f0df6dae.tar.gz | |
Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1 am: b4fb5feffc am: 12448ab311 am: c759e6a989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346
Change-Id: I3ae3355c7984d6b4b89463059cf1bd6159b963bb
| -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); |