Merge "Only resolve users on content:// Uris." into pi-dev (766343cb) · Commits · e / os / android_frameworks_base

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);
		}
		}
		}