Merge "Making getProviderMimeType work across users." into lmp-dev (c3093eb8) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentResolver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,7 @@ public abstract class ContentResolver {

		try {
		String type = ActivityManagerNative.getDefault().getProviderMimeType(
		url, UserHandle.myUserId());
		ContentProvider.getUriWithoutUserId(url), resolveUserId(url));
		return type;
		} catch (RemoteException e) {
		// Arbitrary and not worth documenting, as Activity

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

+28 −9

Original line number	Diff line number	Diff line
		@@ -8971,8 +8971,10 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		/**
		* Allows app to retrieve the MIME type of a URI without having permission
		* to access its content provider.
		* Allows apps to retrieve the MIME type of a URI.
		* If an app is in the same user as the ContentProvider, or if it is allowed to interact across
		* users, then it does not need permission to access the ContentProvider.
		* Either, it needs cross-user uri grants.
		*
		* CTS tests for this functionality can be run with "runtest cts-appsecurity".
		*
		@@ -8981,12 +8983,22 @@ public final class ActivityManagerService extends ActivityManagerNative
		*/
		public String getProviderMimeType(Uri uri, int userId) {
		enforceNotIsolatedCaller("getProviderMimeType");
		userId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
		userId, false, ALLOW_NON_FULL_IN_PROFILE, "getProviderMimeType", null);
		final String name = uri.getAuthority();
		final long ident = Binder.clearCallingIdentity();
		int callingUid = Binder.getCallingUid();
		int callingPid = Binder.getCallingPid();
		long ident = 0;
		boolean clearedIdentity = false;
		userId = unsafeConvertIncomingUser(userId);
		if (UserHandle.getUserId(callingUid) != userId) {
		if (checkComponentPermission(INTERACT_ACROSS_USERS, callingPid,
		callingUid, -1, true) == PackageManager.PERMISSION_GRANTED
		\|\| checkComponentPermission(INTERACT_ACROSS_USERS_FULL, callingPid,
		callingUid, -1, true) == PackageManager.PERMISSION_GRANTED) {
		clearedIdentity = true;
		ident = Binder.clearCallingIdentity();
		}
		}
		ContentProviderHolder holder = null;

		try {
		holder = getContentProviderExternalUnchecked(name, null, userId);
		if (holder != null) {
		@@ -8996,11 +9008,18 @@ public final class ActivityManagerService extends ActivityManagerNative
		Log.w(TAG, "Content provider dead retrieving " + uri, e);
		return null;
		} finally {
		// We need to clear the identity to call removeContentProviderExternalUnchecked
		if (!clearedIdentity) {
		ident = Binder.clearCallingIdentity();
		}
		try {
		if (holder != null) {
		removeContentProviderExternalUnchecked(name, null, userId);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		return null;
		}