Merge "Fixed NPE during monkey testing." (7985f418) · Commits · e / os / android_frameworks_base

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -749,6 +749,9 @@ final class ActivityRecord implements AppWindowContainerListener {
		}

		void removeWindowContainer() {
		// Resume key dispatching if it is currently paused before we remove the container.
		resumeKeyDispatchingLocked();

		mWindowContainerController.removeContainer(getDisplayId());
		mWindowContainerController = null;
		}