am 47e53319: Revert "Recompute focus stack if cleared while starting an activity." (6974f22d) · Commits · e / os / android_frameworks_base

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

+7 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1944,22 +1944,15 @@ public final class ActivityStackSupervisor implements DisplayListener {
	r, top.task);		r, top.task);
	top.deliverNewIntentLocked(callingUid, r.intent, r.launchedFromPackage);		top.deliverNewIntentLocked(callingUid, r.intent, r.launchedFromPackage);
	} else {		} else {
	// A special case: we need to start the activity because it is not		// A special case: we need to
	// currently running, and the caller has asked to clear the current		// start the activity because it is not currently
	// task to have this activity at the top.		// running, and the caller has asked to clear the
			// current task to have this activity at the top.
	addingToTask = true;		addingToTask = true;
	// Now pretend like this activity is being started by the top of its		// Now pretend like this activity is being started
	// task, so it is put in the right place.		// by the top of its task, so it is put in the
			// right place.
	sourceRecord = intentActivity;		sourceRecord = intentActivity;
	TaskRecord task = sourceRecord.task;
	if (task != null && task.stack == null) {
	// Target stack got cleared when we all activities were removed
	// above. Go ahead and reset it.
	targetStack = computeStackFocus(sourceRecord, false /* newTask */);
	targetStack.addTask(
	task, !launchTaskBehind /* toTop /, false / moving */);
	}

	}		}
	} else if (r.realActivity.equals(intentActivity.task.realActivity)) {		} else if (r.realActivity.equals(intentActivity.task.realActivity)) {
	// In this case the top activity on the task is the		// In this case the top activity on the task is the