Merge "Grant MMS Uri permissions as the calling UID." (42bb1608) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,13 @@ public abstract class ActivityManagerInternal {
		*/
		public static final int APP_TRANSITION_TIMEOUT = 3;

		/**
		* Grant Uri permissions from one app to another. This method only extends
		* permission grants if {@code callingUid} has permission to them.
		*/
		public abstract void grantUriPermissionFromIntent(int callingUid, String targetPkg,
		Intent intent, int targetUserId);

		/**
		* Verify that calling app has access to the given provider.
		*/

services/core/java/com/android/server/MmsServiceBroker.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.server;

		import android.Manifest;
		import android.app.ActivityManagerInternal;
		import android.app.AppOpsManager;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		@@ -499,13 +500,21 @@ public class MmsServiceBroker extends SystemService {
		*/
		private Uri adjustUriForUserAndGrantPermission(Uri contentUri, String action,
		int permission) {
		final Intent grantIntent = new Intent();
		grantIntent.setData(contentUri);
		grantIntent.setFlags(permission);

		final int callingUid = Binder.getCallingUid();
		final int callingUserId = UserHandle.getCallingUserId();
		if (callingUserId != UserHandle.USER_SYSTEM) {
		contentUri = ContentProvider.maybeAddUserId(contentUri, callingUserId);
		}

		long token = Binder.clearCallingIdentity();
		try {
		mContext.grantUriPermission(PHONE_PACKAGE_NAME, contentUri, permission);
		LocalServices.getService(ActivityManagerInternal.class)
		.grantUriPermissionFromIntent(callingUid, PHONE_PACKAGE_NAME,
		grantIntent, UserHandle.USER_SYSTEM);

		// Grant permission for the carrier app.
		Intent intent = new Intent(action);
		@@ -514,7 +523,9 @@ public class MmsServiceBroker extends SystemService {
		List<String> carrierPackages = telephonyManager.getCarrierPackageNamesForIntent(
		intent);
		if (carrierPackages != null && carrierPackages.size() == 1) {
		mContext.grantUriPermission(carrierPackages.get(0), contentUri, permission);
		LocalServices.getService(ActivityManagerInternal.class)
		.grantUriPermissionFromIntent(callingUid, carrierPackages.get(0),
		grantIntent, UserHandle.USER_SYSTEM);
		}
		} finally {
		Binder.restoreCallingIdentity(token);

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -22139,6 +22139,15 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		private final class LocalService extends ActivityManagerInternal {
		@Override
		public void grantUriPermissionFromIntent(int callingUid, String targetPkg, Intent intent,
		int targetUserId) {
		synchronized (ActivityManagerService.this) {
		ActivityManagerService.this.grantUriPermissionFromIntentLocked(callingUid,
		targetPkg, intent, null, targetUserId);
		}
		}

		@Override
		public String checkContentProviderAccess(String authority, int userId) {
		return ActivityManagerService.this.checkContentProviderAccess(authority, userId);