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

Commit e277dd66 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-cc05fad6b5eb44a4a73b8cf2d8400624" into tm-mainline-prod 

* changes:
  [automerge] Fix NPE when adding window with policy to hide 2p: 28dc4cbb
  Fix NPE when adding window with policy to hide
parents f51d0869 06ff14f7

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.