Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4a7967ad9ac76d8b9d6285bc367c33d1b6c83235':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
This commit is contained in:
Wale Ogunwale
2015-04-03 00:26:49 +00:00
committed by Android Git Automerger
parent fb397cf827 4a7967ad9a
commit 5fd6b13903
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/WindowAnimator.java
View File

@@ -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;
}
}
}