Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d6a96b authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE]... 

am fce4220b: 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 'fce4220b':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
parents 30c688da fce4220b

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;

            }

        }

    }