Merge "ActivityManagerService: Allow openContentUri from vendor/system/product." into sc-dev (92577efb) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -6284,7 +6284,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		mActivityTaskManager.unhandledBack();
		}

		// TODO: Move to ContentProviderHelper?
		// TODO: Replace this method with one that returns a bound IContentProvider.
		public ParcelFileDescriptor openContentUri(String uriString) throws RemoteException {
		enforceNotIsolatedCaller("openContentUri");
		final int userId = UserHandle.getCallingUserId();
		@@ -6313,6 +6313,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		Log.e(TAG, "Cannot find package for uid: " + uid);
		return null;
		}

		final ApplicationInfo appInfo = mPackageManagerInt.getApplicationInfo(
		androidPackage.getPackageName(), /flags/0, Process.SYSTEM_UID,
		UserHandle.USER_SYSTEM);
		if (!appInfo.isVendor() && !appInfo.isSystemApp() && !appInfo.isSystemExt()
		&& !appInfo.isProduct()) {
		Log.e(TAG, "openContentUri may only be used by vendor/system/product.");
		return null;
		}

		final AttributionSource attributionSource = new AttributionSource(
		Binder.getCallingUid(), androidPackage.getPackageName(), null);
		pfd = cph.provider.openFile(attributionSource, uri, "r", null);