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

Commit 122a8ac2 authored by Steven Ng's avatar Steven Ng
Browse files

Add logic to determine if a wallpaper is compatible with a display 

Also fix a bug that the fallback wallpaper isn't used after setting a new wallpaper due to the wallpaper connection hasn't established yet.

Test: atests FrameworksMockingServicesTests:WallpaperManagerServiceTests
Flag: android.app.enable_connected_displays_wallpaper
Bug: 384519749
Bug: 384521079

Change-Id: I392a072e87a6977e89a9b8e884d7a2f07d1c0708
parent cc83e680

services/core/java/com/android/server/wallpaper/WallpaperCropper.java

+53 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.wallpaper;



import static android.app.WallpaperManager.ORIENTATION_LANDSCAPE;

import static android.app.WallpaperManager.ORIENTATION_SQUARE_LANDSCAPE;

import static android.app.WallpaperManager.ORIENTATION_UNKNOWN;

import static android.app.WallpaperManager.getOrientation;

import static android.app.WallpaperManager.getRotatedOrientation;
@@ -28,6 +30,7 @@ import static com.android.server.wallpaper.WallpaperUtils.WALLPAPER; 
import static com.android.server.wallpaper.WallpaperUtils.getWallpaperDir;

import static com.android.window.flags.Flags.multiCrop;



import android.app.WallpaperManager;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.ImageDecoder;
@@ -821,4 +824,54 @@ public class WallpaperCropper { 
            }

        }

    }



    /**

     * Returns true if a wallpaper is compatible with a given display with ID, {@code displayId}.

     *

     * <p>A wallpaper is compatible with a display if any of the following are true

     * <ol>the display is a default display</o>

     * <ol>the wallpaper is a stock wallpaper</ol>

     * <ol>the wallpaper size is at least 3/4 of the display resolution and, in landscape displays,

     * the wallpaper has an aspect ratio of at least 11:13.</ol>

     */

    @VisibleForTesting

    boolean isWallpaperCompatibleForDisplay(int displayId, WallpaperData wallpaperData) {

        if (displayId == DEFAULT_DISPLAY) {

            return true;

        }



        File wallpaperFile = wallpaperData.getWallpaperFile();

        if (!wallpaperFile.exists()) {

            // Assumption: Stock wallpaper is suitable for all display sizes.

            return true;

        }



        DisplayInfo displayInfo = mWallpaperDisplayHelper.getDisplayInfo(displayId);

        Point displaySize = new Point(displayInfo.logicalWidth, displayInfo.logicalHeight);

        int displayOrientation = WallpaperManager.getOrientation(displaySize);



        Point wallpaperImageSize = new Point(

                (int) Math.ceil(wallpaperData.cropHint.width() / wallpaperData.mSampleSize),

                (int) Math.ceil(wallpaperData.cropHint.height() / wallpaperData.mSampleSize));

        if (wallpaperImageSize.equals(0, 0)) {

            BitmapFactory.Options options = new BitmapFactory.Options();

            options.inJustDecodeBounds = true;

            BitmapFactory.decodeFile(wallpaperFile.getAbsolutePath(), options);

            wallpaperImageSize.set(options.outWidth, options.outHeight);

        }



        double maxDisplayToImageRatio = Math.max((double) displaySize.x / wallpaperImageSize.x,

                (double) displaySize.y / wallpaperImageSize.y);

        if (maxDisplayToImageRatio > 1.5) {

            return false;

        }



        // For displays in landscape, we only support images with an aspect ratio >= 11:13

        if (displayOrientation == ORIENTATION_LANDSCAPE) {

            return ((double) wallpaperImageSize.x / wallpaperImageSize.y) >= 11.0 / 13;

        }



        // For other orientations, we don't enforce any aspect ratio.

        return true;

    }

}

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+5 −21
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ import android.service.wallpaper.WallpaperService; 
import android.system.ErrnoException;

import android.system.Os;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.IntArray;

import android.util.Slog;
@@ -161,7 +160,6 @@ import java.util.List; 
import java.util.Locale;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.function.Consumer;

import java.util.function.Predicate;
@@ -743,10 +741,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
    final WallpaperDisplayHelper mWallpaperDisplayHelper;

    final WallpaperCropper mWallpaperCropper;



    // TODO(b/384519749): Remove this set after we introduce the aspect ratio check.

    private final Set<Integer> mWallpaperCompatibleDisplaysForTest = new ArraySet<>();



    private boolean isWallpaperCompatibleForDisplay(int displayId, WallpaperConnection connection) {

    @VisibleForTesting

    boolean isWallpaperCompatibleForDisplay(int displayId, WallpaperConnection connection) {

        if (connection == null) {

            return false;

        }
@@ -757,26 +753,14 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 


        // Image wallpaper

        if (isDeviceEligibleForDesktopExperienceWallpaper(mContext)) {

            // TODO(b/384519749): check display's resolution and image wallpaper cropped image

            //  aspect ratio.

            return displayId == DEFAULT_DISPLAY

                    || mWallpaperCompatibleDisplaysForTest.contains(displayId);

            return mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                    connection.mWallpaper);

        }

        // When enableConnectedDisplaysWallpaper is off, we assume the image wallpaper supports all

        // usable displays.

        return true;

    }



    @VisibleForTesting

    void addWallpaperCompatibleDisplayForTest(int displayId) {

        mWallpaperCompatibleDisplaysForTest.add(displayId);

    }



    @VisibleForTesting

    void removeWallpaperCompatibleDisplayForTest(int displayId) {

        mWallpaperCompatibleDisplaysForTest.remove(displayId);

    }



    private void updateFallbackConnection(int clientUid) {

        if (mLastWallpaper == null || mFallbackWallpaper == null) return;

        final WallpaperConnection systemConnection = mLastWallpaper.connection;
@@ -844,7 +828,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    // `which` flag.

                    DisplayConnector fallbackConnector =

                            mFallbackWallpaper.connection.getDisplayConnectorOrCreate(displayId);

                    if (fallbackConnector != null && fallbackConnector.mEngine != null) {

                    if (fallbackConnector != null) {

                        fallbackConnector.mWhich = which;

                        fallbackConnector.connectLocked(mFallbackWallpaper.connection,

                                mFallbackWallpaper);

services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperCropperTest.java

+194 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wallpaper;



import static android.app.WallpaperManager.FLAG_SYSTEM;

import static android.app.WallpaperManager.ORIENTATION_LANDSCAPE;

import static android.app.WallpaperManager.ORIENTATION_UNKNOWN;

import static android.app.WallpaperManager.ORIENTATION_PORTRAIT;
@@ -23,13 +24,20 @@ import static android.app.WallpaperManager.ORIENTATION_SQUARE_LANDSCAPE; 
import static android.app.WallpaperManager.ORIENTATION_SQUARE_PORTRAIT;

import static android.app.WallpaperManager.getOrientation;

import static android.app.WallpaperManager.getRotatedOrientation;

import static android.os.UserHandle.USER_SYSTEM;

import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;

import static com.android.window.flags.Flags.FLAG_MULTI_CROP;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;

import static org.mockito.MockitoAnnotations.initMocks;
@@ -37,15 +45,29 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.util.Log;

import android.util.SparseArray;

import android.view.Display;

import android.view.DisplayInfo;



import androidx.test.runner.AndroidJUnit4;



import com.android.dx.mockito.inline.extended.ExtendedMockito;

import com.android.dx.mockito.inline.extended.StaticMockitoSession;



import org.junit.AfterClass;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.RuleChain;

import org.junit.rules.TemporaryFolder;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.quality.Strictness;



import java.io.File;

import java.io.IOException;

import java.util.Comparator;

import java.util.List;
@@ -57,6 +79,7 @@ import java.util.List; 
@RunWith(AndroidJUnit4.class)

@RequiresFlagsEnabled(FLAG_MULTI_CROP)

public class WallpaperCropperTest {

    private static final String TAG = "WallpaperCropperTest";



    @Mock

    private WallpaperDisplayHelper mWallpaperDisplayHelper;
@@ -94,6 +117,8 @@ public class WallpaperCropperTest { 
    private static final List<List<Point>> ALL_FOLDABLE_DISPLAYS = List.of(

            FOLDABLE_ONE, FOLDABLE_TWO, FOLDABLE_THREE, FOLDABLE_FOUR);



    private static StaticMockitoSession sMockitoSession;



    private SparseArray<Point> mDisplaySizes = new SparseArray<>();

    private int mFolded = ORIENTATION_UNKNOWN;

    private int mFoldedRotated = ORIENTATION_UNKNOWN;
@@ -103,12 +128,53 @@ public class WallpaperCropperTest { 
    private static final List<Integer> ALL_MODES = List.of(

            WallpaperCropper.ADD, WallpaperCropper.REMOVE, WallpaperCropper.BALANCE);



    private final SparseArray<File> mTempDirs = new SparseArray<>();



    private final TemporaryFolder mFolder = new TemporaryFolder();



    @Rule

    public RuleChain rules = RuleChain.outerRule(mFolder);



    @BeforeClass

    public static void setUpClass() {

        sMockitoSession = mockitoSession()

                .strictness(Strictness.LENIENT)

                .spyStatic(WallpaperUtils.class)

                .startMocking();

    }



    @AfterClass

    public static void tearDownClass() {

        if (sMockitoSession != null) {

            sMockitoSession.finishMocking();

            sMockitoSession = null;

        }

    }



    @Before

    public void setUp() {

        initMocks(this);

        ExtendedMockito.doAnswer(invocation -> {

            int userId = (invocation.getArgument(0));

            return getWallpaperTestDir(userId);

        }).when(() -> WallpaperUtils.getWallpaperDir(anyInt()));



        mWallpaperCropper = new WallpaperCropper(mWallpaperDisplayHelper);

    }



    private File getWallpaperTestDir(int userId) {

        File tempDir = mTempDirs.get(userId);

        if (tempDir == null) {

            try {

                tempDir = mFolder.newFolder(String.valueOf(userId));

                mTempDirs.append(userId, tempDir);

            } catch (IOException e) {

                Log.e(TAG, "getWallpaperTestDir failed at userId= " + userId);

            }

        }

        return tempDir;

    }



    private void setUpWithDisplays(List<Point> displaySizes) {

        mDisplaySizes = new SparseArray<>();

        displaySizes.forEach(size -> {
@@ -632,6 +698,134 @@ public class WallpaperCropperTest { 
        }

    }



    // Test isWallpaperCompatibleForDisplay always return true for the default display.

    @Test

    public void isWallpaperCompatibleForDisplay_defaultDisplay_returnTrue()

            throws Exception {

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 2560;

        displayInfo.logicalHeight = 1044;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(DEFAULT_DISPLAY));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ false,

                new Point(100, 100));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(DEFAULT_DISPLAY,

                        wallpaperData)).isTrue();

    }



    // Test isWallpaperCompatibleForDisplay always return true for the stock wallpaper.

    @Test

    public void isWallpaperCompatibleForDisplay_stockWallpaper_returnTrue()

            throws Exception {

        final int displayId = 2;

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 2560;

        displayInfo.logicalHeight = 1044;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(displayId));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ true,

                new Point(100, 100));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                        wallpaperData)).isTrue();

    }



    // Test isWallpaperCompatibleForDisplay wallpaper is suitable for the display and wallpaper

    // aspect ratio meets the hard-coded aspect ratio.

    @Test

    public void isWallpaperCompatibleForDisplay_wallpaperSizeSuitableForDisplayAndMeetAspectRatio_returnTrue()

            throws Exception {

        final int displayId = 2;

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 2560;

        displayInfo.logicalHeight = 1044;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(displayId));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ false,

                new Point(4000, 3000));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                        wallpaperData)).isTrue();

    }



    // Test isWallpaperCompatibleForDisplay wallpaper is not suitable for the display and wallpaper

    // aspect ratio meets the hard-coded aspect ratio.

    @Test

    public void isWallpaperCompatibleForDisplay_wallpaperSizeNotSuitableForDisplayAndMeetAspectRatio_returnFalse()

            throws Exception {

        final int displayId = 2;

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 2560;

        displayInfo.logicalHeight = 1044;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(displayId));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ false,

                new Point(1000, 500));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                        wallpaperData)).isFalse();

    }



    // Test isWallpaperCompatibleForDisplay wallpaper is suitable for the display and wallpaper

    // aspect ratio doesn't meet the hard-coded aspect ratio.

    @Test

    public void isWallpaperCompatibleForDisplay_wallpaperSizeSuitableForDisplayAndDoNotMeetAspectRatio_returnFalse()

            throws Exception {

        final int displayId = 2;

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 2560;

        displayInfo.logicalHeight = 1044;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(displayId));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ false,

                new Point(2000, 4000));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                        wallpaperData)).isFalse();

    }



    // Test isWallpaperCompatibleForDisplay, portrait display, wallpaper is suitable for the display

    // and wallpaper aspect ratio doesn't meet the hard-coded aspect ratio.

    @Test

    public void isWallpaperCompatibleForDisplay_portraitDisplay_wallpaperSizeSuitableForDisplayAndMeetAspectRatio_returnTrue()

            throws Exception {

        final int displayId = 2;

        DisplayInfo displayInfo = new DisplayInfo();

        displayInfo.logicalWidth = 1044;

        displayInfo.logicalHeight = 2560;

        doReturn(displayInfo).when(mWallpaperDisplayHelper).getDisplayInfo(eq(displayId));

        WallpaperData wallpaperData = createWallpaperData(/* isStockWallpaper = */ false,

                new Point(2000, 4000));



        assertThat(

                mWallpaperCropper.isWallpaperCompatibleForDisplay(displayId,

                        wallpaperData)).isTrue();

    }



    private void mockDisplay(int displayId, Point displayResolution) {

        final Display mockDisplay = mock(Display.class);

        when(mockDisplay.getDisplayInfo(any(DisplayInfo.class))).thenAnswer(invocation -> {

            DisplayInfo displayInfo = invocation.getArgument(0);

            displayInfo.displayId = displayId;

            displayInfo.logicalWidth = displayResolution.x;

            displayInfo.logicalHeight = displayResolution.y;

            return true;

        });

    }



    private WallpaperData createWallpaperData(boolean isStockWallpaper, Point wallpaperSize)

            throws Exception {

        WallpaperData wallpaperData = new WallpaperData(USER_SYSTEM, FLAG_SYSTEM);

        File wallpaperFile = wallpaperData.getWallpaperFile();

        if (!isStockWallpaper) {

            wallpaperFile.getParentFile().mkdirs();

            wallpaperFile.createNewFile();

        }

        wallpaperData.cropHint.set(0, 0, wallpaperSize.x, wallpaperSize.y);

        return wallpaperData;

    }



    private static Rect centerOf(Rect container, Point point) {

        checkSubset(container, point);

        int diffWidth = container.width() - point.x;

services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java

+65 −35

File changed.

Preview size limit exceeded, changes collapsed.