Merge "RESTRICT AUTOMERGE Create separated tasks for different apps from... (834e8809) · Commits · e / os / android_frameworks_base

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

+16 −1

Original line number	Diff line number	Diff line
		@@ -940,6 +940,8 @@ class ActivityStarter {
		} else {
		callingPid = callingUid = -1;
		}
		boolean forceNewTask = false;
		final int filterCallingUid = callingUid >= 0 ? callingUid : realCallingUid;
		final long origId = Binder.clearCallingIdentity();
		try {
		synchronized (mService) {
		@@ -959,6 +961,9 @@ class ActivityStarter {

		// Don't modify the client's object!
		intent = new Intent(intent);
		if (forceNewTask) {
		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		}

		// Collect information about the target of the Intent.
		ActivityInfo aInfo = mSupervisor.resolveActivity(intent, resolvedTypes[i], 0,
		@@ -984,7 +989,17 @@ class ActivityStarter {
		return res;
		}

		resultTo = outActivity[0] != null ? outActivity[0].appToken : null;
		final ActivityRecord started = outActivity[0];
		if (started != null && started.getUid() == filterCallingUid) {
		// Only the started activity which has the same uid as the source caller can
		// be the caller of next activity.
		resultTo = started.appToken;
		forceNewTask = false;
		} else {
		// Different apps not adjacent to the caller are forced to be new task.
		resultTo = null;
		forceNewTask = true;
		}
		}
		}
		} finally {