Merge "Fix NPE when trying to add starting window" (e86e6d75) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,9 @@ public class AppWindowContainerController
		final Configuration mergedOverrideConfiguration;

		synchronized (mWindowMap) {
		if (mContainer == null) {
		return;
		}
		startingData = mContainer.startingData;
		mergedOverrideConfiguration = mContainer.getMergedOverrideConfiguration();
		}
		@@ -150,6 +153,9 @@ public class AppWindowContainerController
		+ mContainer + ": startingWindow="
		+ mContainer.startingWindow + " startingView="
		+ mContainer.startingSurface);
		if (mContainer == null) {
		return;
		}
		if (mContainer.startingWindow != null) {
		contents = mContainer.startingSurface;
		token = mContainer.token;