Merge "Start apps with per-user GIDs." (7ebb072a) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -3046,12 +3046,12 @@ public final class ActivityManagerService extends ActivityManagerNative
	int[] permGids = null;		int[] permGids = null;
	try {		try {
	checkTime(startTime, "startProcess: getting gids from package manager");		checkTime(startTime, "startProcess: getting gids from package manager");
	final PackageManager pm = mContext.getPackageManager();		permGids = AppGlobals.getPackageManager().getPackageGids(app.info.packageName,
	permGids = pm.getPackageGids(app.info.packageName);		app.userId);

	if (Environment.isExternalStorageEmulated()) {		if (Environment.isExternalStorageEmulated()) {
	checkTime(startTime, "startProcess: checking external storage perm");		checkTime(startTime, "startProcess: checking external storage perm");
	if (pm.checkPermission(		if (mContext.getPackageManager().checkPermission(
	android.Manifest.permission.ACCESS_ALL_EXTERNAL_STORAGE,		android.Manifest.permission.ACCESS_ALL_EXTERNAL_STORAGE,
	app.info.packageName) == PERMISSION_GRANTED) {		app.info.packageName) == PERMISSION_GRANTED) {
	mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER_ALL;		mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER_ALL;
	@@ -3059,7 +3059,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER;		mountExternal = Zygote.MOUNT_EXTERNAL_MULTIUSER;
	}		}
	}		}
	} catch (PackageManager.NameNotFoundException e) {		} catch (RemoteException e) {
	Slog.w(TAG, "Unable to retrieve gids", e);		Slog.w(TAG, "Unable to retrieve gids", e);
	}		}