am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
* commit '5fd6b139033bcaab52921473ab3998725e157002':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
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 @@
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;
+ }
}
}