Merge "Add Null check in AppWindowToken.onDisplayChanged." (02a2190e) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -1081,11 +1081,15 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		super.onDisplayChanged(dc);
		if (prevDc != null && prevDc.mFocusedApp == this) {
		prevDc.setFocusedApp(null);
		if (dc.getTopStack().getTopChild().getTopChild() == this) {
		final TaskStack stack = dc.getTopStack();
		if (stack != null) {
		final Task task = stack.getTopChild();
		if (task != null && task.getTopChild() == this) {
		dc.setFocusedApp(this);
		}
		}
		}
		}

		/**
		* Freezes the task bounds. The size of this task reported the app will be fixed to the bounds