am 2d6b55aa: am 312ba86b: Change task removal sequence (33fa09b1) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -2734,15 +2734,6 @@ final class ActivityStack {
		here.fillInStackTrace();
		Slog.i(TAG, "Removing activity " + r + " from stack");
		}
		final TaskRecord task = r.task;
		if (task != null && task.removeActivity(r)) {
		if (DEBUG_STACK) Slog.i(TAG,
		"removeActivityFromHistoryLocked: last activity removed from " + this);
		if (mStackSupervisor.isFrontStack(this) && task == topTask() && task.mOnTopOfHome) {
		mStackSupervisor.moveHomeToTop();
		}
		removeTask(task);
		}
		r.takeFromHistory();
		removeTimeoutsForActivityLocked(r);
		if (DEBUG_STATES) Slog.v(TAG, "Moving to DESTROYED: " + r + " (removed from history)");
		@@ -2753,6 +2744,15 @@ final class ActivityStack {
		if (VALIDATE_TOKENS) {
		validateAppTokensLocked();
		}
		final TaskRecord task = r.task;
		if (task != null && task.removeActivity(r)) {
		if (DEBUG_STACK) Slog.i(TAG,
		"removeActivityFromHistoryLocked: last activity removed from " + this);
		if (mStackSupervisor.isFrontStack(this) && task == topTask() && task.mOnTopOfHome) {
		mStackSupervisor.moveHomeToTop();
		}
		removeTask(task);
		}
		cleanUpActivityServicesLocked(r);
		r.removeUriPermissionsLocked();
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -4535,8 +4535,8 @@ public class WindowManagerService extends IWindowManager.Stub

		void removeAppFromTaskLocked(AppWindowToken wtoken) {
		final Task task = mTaskIdToTask.get(wtoken.groupId);
		if (!wtoken.mDeferRemoval && task != null && task.removeAppToken(wtoken)) {
		removeTaskLocked(task);
		if (task != null) {
		task.removeAppToken(wtoken);
		}
		}