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

Commit 9815af77 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Report pending change to wallpaper when being visible" into tm-qpr-dev... 

Merge "Report pending change to wallpaper when being visible" into tm-qpr-dev am: 1abdd8af am: 002280fe am: 4baf2b81 am: 0cf96c32

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



Change-Id: I7a812011de1f3f9c79247970a2c225001cca3a1f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f81a1113 0cf96c32

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

+1 −1
Original line number Diff line number Diff line
@@ -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();

services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java

+25 −0
Original line number Diff line number Diff line
@@ -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;
@@ -339,6 +341,29 @@ public class WallpaperControllerTests extends WindowTestsBase { 
        assertEquals(appWin, mDisplayContent.mWallpaperController.getWallpaperTarget());

    }



    @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();