Merge "Fixed issue with prematurely removing display for child activities." (07e1967c) · Commits · e / os / android_frameworks_base

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

+1 −16

Original line number	Diff line number	Diff line
		@@ -156,8 +156,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		static final int LOCK_TASK_START_MSG = FIRST_SUPERVISOR_STACK_MSG + 9;
		static final int LOCK_TASK_END_MSG = FIRST_SUPERVISOR_STACK_MSG + 10;
		static final int CONTAINER_CALLBACK_TASK_LIST_EMPTY = FIRST_SUPERVISOR_STACK_MSG + 11;
		static final int CONTAINER_TASK_LIST_EMPTY_TIMEOUT = FIRST_SUPERVISOR_STACK_MSG + 12;
		static final int LAUNCH_TASK_BEHIND_COMPLETE = FIRST_SUPERVISOR_STACK_MSG + 13;
		static final int LAUNCH_TASK_BEHIND_COMPLETE = FIRST_SUPERVISOR_STACK_MSG + 12;

		private final static String VIRTUAL_DISPLAY_BASE_NAME = "ActivityViewVirtualDisplay";

		@@ -3803,15 +3802,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		}
		} break;
		case CONTAINER_TASK_LIST_EMPTY_TIMEOUT: {
		synchronized (mService) {
		Slog.w(TAG, "Timeout waiting for all activities in task to finish. " +
		msg.obj);
		final ActivityContainer container = (ActivityContainer) msg.obj;
		container.mStack.finishAllActivitiesLocked(true);
		container.onTaskListEmptyLocked();
		}
		} break;
		case LAUNCH_TASK_BEHIND_COMPLETE: {
		synchronized (mService) {
		ActivityRecord r = ActivityRecord.forTokenLocked((IBinder) msg.obj);
		@@ -3916,10 +3906,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		mContainerState = CONTAINER_STATE_FINISHING;

		final Message msg =
		mHandler.obtainMessage(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);
		mHandler.sendMessageDelayed(msg, 2000);

		long origId = Binder.clearCallingIdentity();
		try {
		mStack.finishAllActivitiesLocked(false);
		@@ -4039,7 +4025,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}

		void onTaskListEmptyLocked() {
		mHandler.removeMessages(CONTAINER_TASK_LIST_EMPTY_TIMEOUT, this);
		detachLocked();
		deleteActivityContainer(this);
		mHandler.obtainMessage(CONTAINER_CALLBACK_TASK_LIST_EMPTY, this).sendToTarget();