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

Commit 06ff14f7 authored by Riddle Hsu's avatar Riddle Hsu Committed by Presubmit Automerger Backend
Browse files

[automerge] Fix NPE when adding window with policy to hide 2p: 28dc4cbb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352089

Bug: 226259929
Change-Id: Ia4de5dc77f6bb51b7f39db776fc0bca7d64c22be
parents 84bf7eb6 28dc4cbb

services/core/java/com/android/server/wm/WindowState.java

+1 −1
Original line number Diff line number Diff line
@@ -5288,7 +5288,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (mControllableInsetProvider != null) {

            return;

        }

        if (mDisplayContent.inTransition()) {

        if (getDisplayContent().inTransition()) {

            // Skip because the animation is usually unnoticeable (e.g. covered by rotation

            // animation) and the animation bounds could be inconsistent, such as depending

            // on when the window applies its draw transaction with new rotation.