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

Commit 12642bfb authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Only resolve users on content:// Uris." into pi-dev 

am: 766343cb

Change-Id: Ibc3d03e645e07324484a8a2f4db9832d042a07d3
parents 1a007fd6 766343cb

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -1262,8 +1262,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }















        public static GrantUri resolve(int defaultSourceUserHandle, Uri uri) {













            if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {















                return new GrantUri(ContentProvider.getUserIdFromUri(uri, defaultSourceUserHandle),















                        ContentProvider.getUriWithoutUserId(uri), false);













            } else {













                return new GrantUri(defaultSourceUserHandle, uri, false);













            }















        }















    }