Merge "Remove outdated wallpaper visibility update" into main (6cfd0725) · Commits · e / os / android_frameworks_base

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -1007,8 +1007,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		private final Consumer<WindowState> mApplySurfaceChangesTransaction = w -> {
		final WindowSurfacePlacer surfacePlacer = mWmService.mWindowPlacerLocked;
		final boolean obscuredChanged = w.mObscured !=
		mTmpApplySurfaceChangesTransactionState.obscured;
		final RootWindowContainer root = mWmService.mRoot;

		if (w.mHasSurface) {
		@@ -1107,12 +1105,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}
		}

		if (obscuredChanged && w.isVisible() && mWallpaperController.isWallpaperTarget(w)) {
		// This is the wallpaper target and its obscured state changed... make sure the
		// current wallpaper's visibility has been updated accordingly.
		mWallpaperController.updateWallpaperTokens(mDisplayContent.isKeyguardLocked());
		}

		w.handleWindowMovedIfNeeded();

		//Slog.i(TAG, "Window " + this + " clearing mContentChanged - done placing");

+0 −5

Original line number	Diff line number	Diff line
		@@ -856,11 +856,6 @@ class WallpaperController {
		result.setWallpaperTarget(wallpaperTarget);
		}

		public void updateWallpaperTokens(boolean keyguardLocked) {
		updateWallpaperTokens(mWallpaperTarget != null \|\| mPrevWallpaperTarget != null,
		keyguardLocked);
		}

		/**
		* Change the visibility of the top wallpaper to {@param visibility} and hide all the others.
		*/