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

Commit ed090028 authored by James O'Leary's avatar James O'Leary Committed by Automerger Merge Worker
Browse files

Merge changes Ifc451f54,Ifefd3e56 into sc-dev am: 0e8f141f 

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

Change-Id: I82a584721770e8e4a52176f82eea74b2c82b48bf
parents 829b7e4e 0e8f141f

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 = wpData.mHeight != cropHint.height()

            needScale = cropHint.height() > wpData.mHeight

                    || 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.JPEG, 100, bos);

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

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

                        success = true;

                    }