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

Commit fa148044 authored May 25, 2022 by Riddle Hsu Committed by Automerger Merge Worker May 25, 2022

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

Merge "Do not force relayout for wallpaper visibility change" into tm-qpr-dev am: 9496a69d am: 0126c449

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

Change-Id: I4bc27fdf12e058f1caeb5991856f5139b6259057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f1f25226 0126c449

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -1539,8 +1539,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) {