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

Commit 566ff78c authored by Owen Kim's avatar Owen Kim Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-14802973-JAWUFIIXLT" into sc-dev 

* changes:
  Revert "Only rescale wallpaper if its > display height"
  Revert "Cache set wallpaper as PNG instead of JPEG"
parents ebcaa39d 1e54afcc

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

+2 −2
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            }



            // scale if the crop height winds up not matching the recommended metrics

            needScale = cropHint.height() > wpData.mHeight

            needScale = wpData.mHeight != cropHint.height()

                    || cropHint.height() > GLHelper.getMaxTextureSize()

                    || cropHint.width() > GLHelper.getMaxTextureSize();
@@ -752,7 +752,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 


                        f = new FileOutputStream(wallpaper.cropFile);

                        bos = new BufferedOutputStream(f, 32*1024);

                        finalCrop.compress(Bitmap.CompressFormat.PNG, 100, bos);

                        finalCrop.compress(Bitmap.CompressFormat.JPEG, 100, bos);

                        bos.flush();  // don't rely on the implicit flush-at-close when noting success

                        success = true;

                    }