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

Commit 1c92459a authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 16a61a51: Merge "Revert "Merge errors."" into jb-dev 

* commit '16a61a51':
  Revert "Merge errors."
parents d5759f1c 16a61a51

services/java/com/android/server/wm/WindowAnimator.java

+9 −1
Original line number Diff line number Diff line
@@ -496,7 +496,15 @@ public class WindowAnimator { 


            final int N = mWinAnimators.size();

            for (int i = 0; i < N; i++) {

                mWinAnimators.get(i).prepareSurfaceLocked(true);

                final WindowStateAnimator winAnimator = mWinAnimators.get(i);

                if (winAnimator.mWin.mIsWallpaper && mService.mWallpaperTarget == null) {

                    if (!winAnimator.mWin.mWallpaperVisible && !winAnimator.mLastHidden) {

                        // Wallpaper is no longer visible and there is no wp target => hide it.

                        winAnimator.hide();

                    }

                    continue;

                }

                winAnimator.prepareSurfaceLocked(true);

            }



            if (mDimParams != null) {

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

+1 −4
Original line number Diff line number Diff line
@@ -1063,10 +1063,7 @@ class WindowStateAnimator { 


        setSurfaceBoundaries(recoveringMemory);



        if (mWin.mIsWallpaper && !mWin.mWallpaperVisible) {

            // Wallpaper is no longer visible and there is no wp target => hide it.

            hide();

        } else if (w.mAttachedHidden || !w.isReadyForDisplay()) {

        if (w.mAttachedHidden || !w.isReadyForDisplay()) {

            hide();

            mAnimator.hideWallpapersLocked(w);