Merge "Fix NPE when removing PIP stack" into rvc-dev (e4d2c176) · Commits · e / os / android_frameworks_base

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

+5 −1

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

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