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

Commit c5bdda22 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 

am: ff8ceadf

* commit 'ff8ceadf':
  Request a traversal when a saved surface gets redrawn

Change-Id: I5cd93f39d2cf2b11e405f4d9f05ecb6bc2040267
parents dbf0dbd8 ff8ceadf

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

+3 −1
Original line number Diff line number Diff line
@@ -2115,14 +2115,16 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        mWasVisibleBeforeClientHidden = false;

    }



    void clearAnimatingWithSavedSurface() {

    boolean clearAnimatingWithSavedSurface() {

        if (mAnimatingWithSavedSurface) {

            // App has drawn something to its windows, we're no longer animating with

            // the saved surfaces.

            if (DEBUG_ANIM) Slog.d(TAG,

                    "clearAnimatingWithSavedSurface(): win=" + this);

            mAnimatingWithSavedSurface = false;

            return true;

        }

        return false;

    }



    @Override

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

+3 −3
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ class WindowStateAnimator { 
                    + drawStateToString());

        }



        mWin.clearAnimatingWithSavedSurface();

        boolean layoutNeeded = mWin.clearAnimatingWithSavedSurface();



        if (mDrawState == DRAW_PENDING) {

            if (DEBUG_SURFACE_TRACE || DEBUG_ANIM || SHOW_TRANSACTIONS || DEBUG_ORIENTATION)
@@ -595,10 +595,10 @@ class WindowStateAnimator { 
                Slog.v(TAG, "Draw state now committed in " + mWin);

            }

            mDrawState = COMMIT_DRAW_PENDING;

            return true;

            layoutNeeded = true;

        }



        return false;

        return layoutNeeded;

    }



    // This must be called while inside a transaction.