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

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

Merge "Do not force relayout for wallpaper visibility change" into tm-qpr-dev

parents 36e4c65c 07f2a71e

core/java/android/service/wallpaper/WallpaperService.java

+3 −2
Original line number Diff line number Diff line
@@ -1536,8 +1536,9 @@ public abstract class WallpaperService extends Service { 
                        // may have been destroyed so now we need to make

                        // sure it is re-created.

                        doOffsetsChanged(false);

                        // force relayout to get new surface

                        updateSurface(true, false, false);

                        // It will check mSurfaceCreated so no need to force relayout.

                        updateSurface(false /* forceRelayout */, false /* forceReport */,

                                false /* redrawNeeded */);

                    }

                    onVisibilityChanged(visible);

                    if (mReportedVisible && mFrozenRequested) {

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

+6 −0
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ class WindowSurfaceController { 
                "Destroying surface %s called by %s", this, Debug.getCallers(8));

        try {

            if (mSurfaceControl != null) {

                if (mAnimator.mIsWallpaper && !mAnimator.mWin.mWindowRemovalAllowed

                        && !mAnimator.mWin.mRemoveOnExit) {

                    // The wallpaper surface should have the same lifetime as its window.

                    Slog.e(TAG, "Unexpected removing wallpaper surface of " + mAnimator.mWin

                            + " by " + Debug.getCallers(8));

                }

                t.remove(mSurfaceControl);

            }

        } catch (RuntimeException e) {