Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "revert-14802973-JAWUFIIXLT" into sc-dev am: 566ff78c26

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

Change-Id: Iffe7a4816bdc8f758fdf2b58add3aa3a4fbf9cda
This commit is contained in:
Owen Kim
2021-06-07 09:48:59 +00:00
committed by Automerger Merge Worker
parent 5ddd057d37 566ff78c26
commit 383821aab8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -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;
}