Merge "Fix NPE when removing PIP stack" into rvc-dev am: e4d2c176c6 am:... (54990360) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -715,9 +715,13 @@ class ActivityStack extends Task {

		private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode,
		boolean creating) {
		final TaskDisplayArea taskDisplayArea = getDisplayArea();
		if (taskDisplayArea == null) {
		Slog.d(TAG, "taskDisplayArea is null, bail early");
		return;
		}
		final int currentMode = getWindowingMode();
		final int currentOverrideMode = getRequestedOverrideWindowingMode();
		final TaskDisplayArea taskDisplayArea = getDisplayArea();
		final Task topTask = getTopMostTask();
		int windowingMode = preferredWindowingMode;
		if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED