Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff93e930 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Verify caller before auto granting slice permission" into qt-dev am:... 

Merge "Verify caller before auto granting slice permission" into qt-dev am: 3d226b76 am: b4fb5fef am: 12448ab3 am: c759e6a9 am: c42ea331 am: 3ab5e586

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17089346

Change-Id: I1e943a299f229755c8300097aef8aed9325028f3
parents 6bd34c6b 3ab5e586

services/core/java/com/android/server/slice/SliceManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -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);