diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-03-09 06:08:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 06:08:50 +0000 |
| commit | b4fb5feffcc31879367a5424cc1ab987ed47dfe7 (patch) | |
| tree | 1d8e76ee610d3f93467f83144501ee98792d14e5 | |
| parent | c0d12c6b4a3cff9d478f1751e1d85a7af02e0173 (diff) | |
| parent | 3d226b76c1e6c29580830d00b345c81d8babcd96 (diff) | |
| download | base-b4fb5feffcc31879367a5424cc1ab987ed47dfe7.tar.gz | |
Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346
Change-Id: I20932910644a9d4ca4b3a46c4e4b9f96d504adf6
| -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 5fd2ab87f410..b1728cde6f7e 100644 --- a/services/core/java/com/android/server/slice/SliceManagerService.java +++ b/services/core/java/com/android/server/slice/SliceManagerService.java @@ -237,6 +237,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); |