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

Commit 818d6660 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "WindowState isSyncFinished should also check isVisibleRequested" into... 

Merge "WindowState isSyncFinished should also check isVisibleRequested" into sc-v2-dev am: 1d0c96e8 am: adfa19fd

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

Change-Id: I82843d3b8b13e4278b5b025b02fdc445672b82e9
parents a5e33130 adfa19fd

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -5917,7 +5917,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 




    @Override

    @Override

    boolean isSyncFinished() {

    boolean isSyncFinished() {

        if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mViewVisibility == View.GONE) {

        if (mSyncState == SYNC_STATE_WAITING_FOR_DRAW && mViewVisibility == View.GONE

                && !isVisibleRequested()) {

            // Don't wait for GONE windows. However, we don't alter the state in case the window

            // Don't wait for GONE windows. However, we don't alter the state in case the window

            // becomes un-gone while the syncset is still active.

            // becomes un-gone while the syncset is still active.

            return true;

            return true;