Merge "Iteration on multi-user external storage." into jb-mr1-dev (3451dc90) · Commits · e / os / android_frameworks_base

core/java/android/os/Process.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -582,9 +582,7 @@ public class Process {
		if ((debugFlags & Zygote.DEBUG_ENABLE_ASSERT) != 0) {
		argsForZygote.add("--enable-assert");
		}
		if (mountExternal == Zygote.MOUNT_EXTERNAL_SINGLEUSER) {
		argsForZygote.add("--mount-external-singleuser");
		} else if (mountExternal == Zygote.MOUNT_EXTERNAL_MULTIUSER) {
		if (mountExternal == Zygote.MOUNT_EXTERNAL_MULTIUSER) {
		argsForZygote.add("--mount-external-multiuser");
		}
		argsForZygote.add("--target-sdk-version=" + targetSdkVersion);

+0 −2

Original line number	Diff line number	Diff line
		@@ -527,8 +527,6 @@ class ZygoteConnection {
		"Duplicate arg specified");
		}
		niceName = arg.substring(arg.indexOf('=') + 1);
		} else if (arg.equals("--mount-external-singleuser")) {
		mountExternal = Zygote.MOUNT_EXTERNAL_SINGLEUSER;
		} else if (arg.equals("--mount-external-multiuser")) {
		mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER;
		} else {

+4 −9

Original line number	Diff line number	Diff line
		@@ -1983,18 +1983,13 @@ public final class ActivityManagerService extends ActivityManagerNative
		try {
		final PackageManager pm = mContext.getPackageManager();
		gids = pm.getPackageGids(app.info.packageName);
		if (pm.checkPermission(
		android.Manifest.permission.READ_EXTERNAL_STORAGE, app.info.packageName)
		== PERMISSION_GRANTED) {
		if (Environment.isExternalStorageEmulated()) {
		mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER;
		} else {
		mountExternal = Zygote.MOUNT_EXTERNAL_SINGLEUSER;
		}
		}
		} catch (PackageManager.NameNotFoundException e) {
		Slog.w(TAG, "Unable to retrieve gids", e);
		}

		if (Environment.isExternalStorageEmulated()) {
		mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER;
		}
		}
		if (mFactoryTest != SystemServer.FACTORY_TEST_OFF) {
		if (mFactoryTest == SystemServer.FACTORY_TEST_LOW_LEVEL