resolved conflicts for merge of 4849aa86 to master (f391ebcc) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -2888,16 +2888,19 @@ public final class ActivityStackSupervisor implements DisplayListener {

		@Override
		public void onDisplayAdded(int displayId) {
		Slog.v(TAG, "Display added displayId=" + displayId);
		mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_ADDED, displayId, 0));
		}

		@Override
		public void onDisplayRemoved(int displayId) {
		Slog.v(TAG, "Display removed displayId=" + displayId);
		mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_REMOVED, displayId, 0));
		}

		@Override
		public void onDisplayChanged(int displayId) {
		Slog.v(TAG, "Display changed displayId=" + displayId);
		mHandler.sendMessage(mHandler.obtainMessage(HANDLE_DISPLAY_CHANGED, displayId, 0));
		}

		@@ -3226,10 +3229,17 @@ public final class ActivityStackSupervisor implements DisplayListener {
		return;
		}
		mContainerState = CONTAINER_STATE_FINISHING;

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

		long origId = Binder.clearCallingIdentity();
		try {
		mStack.finishAllActivitiesLocked();
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		}
		}

+5 −2

Original line number	Diff line number	Diff line
		@@ -728,8 +728,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
		}

		public DisplayContent getDisplayContent() {
		return mAppToken == null \|\| mNotOnAppsDisplay ?
		mDisplayContent : getStack().getDisplayContent();
		if (mAppToken == null \|\| mNotOnAppsDisplay) {
		return mDisplayContent;
		}
		final TaskStack stack = getStack();
		return stack == null ? mDisplayContent : stack.getDisplayContent();
		}

		public int getDisplayId() {