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

[DO NOT MERGE] Fixed NPE when trying to animate a window without display

Browse Source 
In some cases it is possible for the AppToken.allAppWindows list to
get out of sync with the list of windows known to WMS if the client
doesn't call Session.remove(Window). This can lead to an NPE when
the animation threads runs and the display for the window has been
removed.

Bug: 19972099
Change-Id: Ifdf9ff2364b96757bba0539394c4a682f64577c9
This commit is contained in:
Wale Ogunwale
2015-04-02 16:13:57 -07:00
parent 37661db7fa
commit 70e12aa123
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;
}
}
}