Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev (f61aee97) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -824,12 +824,16 @@ public class WindowAnimator {
		if (displayId < 0) {
		return 0;
		}
		return mService.getDisplayContentLocked(displayId).pendingLayoutChanges;
		DisplayContent displayContent = mService.getDisplayContentLocked(displayId);
		return (displayContent != null) ? displayContent.pendingLayoutChanges : 0;
		}

		void setPendingLayoutChanges(final int displayId, final int changes) {
		if (displayId >= 0) {
		mService.getDisplayContentLocked(displayId).pendingLayoutChanges \|= changes;
		DisplayContent displayContent = mService.getDisplayContentLocked(displayId);
		if (displayContent != null) {
		displayContent.pendingLayoutChanges \|= changes;
		}
		}
		}