diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index cf0fc0995a9b..f86b997b6c8e 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -4523,7 +4523,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP void requestUpdateWallpaperIfNeeded() { final DisplayContent dc = getDisplayContent(); - if (dc != null && hasWallpaper()) { + if (dc != null && ((mIsWallpaper && !mLastConfigReportedToClient) || hasWallpaper())) { dc.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER; dc.setLayoutNeeded(); mWmService.mWindowPlacerLocked.requestTraversal(); diff --git a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java index ef2b691bac0c..65631ea11e81 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java @@ -52,6 +52,7 @@ import android.graphics.Rect; import android.os.IBinder; import android.os.RemoteException; import android.platform.test.annotations.Presubmit; +import android.util.MergedConfiguration; import android.view.DisplayCutout; import android.view.DisplayInfo; import android.view.DisplayShape; @@ -62,6 +63,7 @@ import android.view.RoundedCorners; import android.view.Surface; import android.view.SurfaceControl; import android.view.WindowManager; +import android.window.ClientWindowFrames; import androidx.test.filters.SmallTest; @@ -340,6 +342,29 @@ public class WallpaperControllerTests extends WindowTestsBase { } @Test + public void testWallpaperReportConfigChange() { + final WindowState wallpaperWindow = createWallpaperWindow(mDisplayContent); + createWallpaperTargetWindow(mDisplayContent); + final WallpaperWindowToken wallpaperToken = wallpaperWindow.mToken.asWallpaperToken(); + makeWindowVisible(wallpaperWindow); + wallpaperWindow.mLayoutSeq = mDisplayContent.mLayoutSeq; + // Assume the token was invisible and the latest config was reported. + wallpaperToken.commitVisibility(false); + wallpaperWindow.fillClientWindowFramesAndConfiguration(new ClientWindowFrames(), + new MergedConfiguration(), true /* useLatestConfig */, false /* relayoutVisible */); + assertTrue(wallpaperWindow.isLastConfigReportedToClient()); + + final Rect bounds = wallpaperToken.getBounds(); + wallpaperToken.setBounds(new Rect(0, 0, bounds.width() / 2, bounds.height() / 2)); + assertFalse(wallpaperWindow.isLastConfigReportedToClient()); + // If there is a pending config change when changing to visible, it should tell the client + // to redraw by WindowState#reportResized. + wallpaperToken.commitVisibility(true); + waitUntilHandlersIdle(); + assertTrue(wallpaperWindow.isLastConfigReportedToClient()); + } + + @Test public void testWallpaperTokenVisibility() { final DisplayContent dc = mWm.mRoot.getDefaultDisplay(); final WindowState wallpaperWindow = createWallpaperWindow(dc); |