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

Commit f7c209bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix wallpaper size changed to -1*-1 on first boot."

parents b8cd5c43 d9173df6

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

+1 −2
Original line number Diff line number Diff line
@@ -2822,8 +2822,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
        IoUtils.closeQuietly(stream);



        if (!success) {

            wpdData.mWidth = -1;

            wpdData.mHeight = -1;

            wallpaper.cropHint.set(0, 0, 0, 0);

            wpdData.mPadding.set(0, 0, 0, 0);

            wallpaper.name = "";
@@ -2839,6 +2837,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            }

        }



        ensureSaneWallpaperDisplaySize(wpdData, DEFAULT_DISPLAY);

        ensureSaneWallpaperData(wallpaper, DEFAULT_DISPLAY);

        WallpaperData lockWallpaper = mLockWallpaperMap.get(userId);

        if (lockWallpaper != null) {