Merge "Remove ExternalStorageProvider special case for having media_rw" (fa83e35f) · Commits · e / os / android_frameworks_base

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

+2 −7

Original line number	Diff line number	Diff line
		@@ -1551,8 +1551,7 @@ public final class ProcessList {
		}
		}

		private int[] computeGidsForProcess(int mountExternal, int uid, int[] permGids,
		String packageName) {
		private int[] computeGidsForProcess(int mountExternal, int uid, int[] permGids) {
		ArrayList<Integer> gidList = new ArrayList<>(permGids.length + 5);

		final int sharedAppGid = UserHandle.getSharedAppGid(UserHandle.getAppId(uid));
		@@ -1583,10 +1582,6 @@ public final class ProcessList {
		// PublicVolumes: /mnt/media_rw/<volume>
		gidList.add(Process.MEDIA_RW_GID);
		}
		if (packageName.equals("com.android.externalstorage")) {
		// Allows access to 'unreliable' (USB OTG) volumes via SAF
		gidList.add(Process.MEDIA_RW_GID);
		}

		int[] gidArray = new int[gidList.size()];
		for (int i = 0; i < gidArray.length; i++) {
		@@ -1669,7 +1664,7 @@ public final class ProcessList {
		}
		}

		gids = computeGidsForProcess(mountExternal, uid, permGids, app.info.packageName);
		gids = computeGidsForProcess(mountExternal, uid, permGids);
		}
		app.mountMode = mountExternal;
		checkSlow(startTime, "startProcess: building args");