am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display

1 files changed, 6 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 64713d9..e833511 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -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;
+            }
         }
     }