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

Commit 9e227736 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Fix test failure due to hanging layout" into sc-v2-dev am: 6d71d158 am: d39232ed 

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

Change-Id: If122671dbe57b050b92e5c5595217741c03ad396
parents 60058085 d39232ed

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -250,10 +250,10 @@ class WindowStateAnimator { 
            // away.

            // away.

            if (mLastHidden && mDrawState != NO_SURFACE && !forceApplyNow) {

            if (mLastHidden && mDrawState != NO_SURFACE && !forceApplyNow) {

                mPostDrawTransaction.merge(postDrawTransaction);

                mPostDrawTransaction.merge(postDrawTransaction);

                layoutNeeded = true;

            } else {

            } else {

                mWin.getSyncTransaction().merge(postDrawTransaction);

                mWin.getSyncTransaction().merge(postDrawTransaction);

            }

            }

            layoutNeeded = true;

        }

        }





        return layoutNeeded;

        return layoutNeeded;