summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperCropper.java4
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperCropper.java b/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
index d5bea4adaf8c..2a7f7053c857 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperCropper.java
@@ -746,8 +746,8 @@ public class WallpaperCropper {
final ImageDecoder.Source srcData =
ImageDecoder.createSource(wallpaper.getWallpaperFile());
final int finalScale = scale;
- final int rescaledBitmapWidth = (int) (0.5f + bitmapSize.x / sampleSize);
- final int rescaledBitmapHeight = (int) (0.5f + bitmapSize.y / sampleSize);
+ final int rescaledBitmapWidth = (int) Math.ceil(bitmapSize.x / sampleSize);
+ final int rescaledBitmapHeight = (int) Math.ceil(bitmapSize.y / sampleSize);
Bitmap cropped = ImageDecoder.decodeBitmap(srcData, (decoder, info, src) -> {
if (!multiCrop()) decoder.setTargetSampleSize(finalScale);
if (multiCrop()) {
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index e29f05336760..d019516cd069 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2380,8 +2380,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
SparseArray<Rect> relativeSuggestedCrops =
mWallpaperCropper.getRelativeCropHints(wallpaper);
Point croppedBitmapSize = new Point(
- (int) (0.5f + wallpaper.cropHint.width() / wallpaper.mSampleSize),
- (int) (0.5f + wallpaper.cropHint.height() / wallpaper.mSampleSize));
+ (int) Math.ceil(wallpaper.cropHint.width() / wallpaper.mSampleSize),
+ (int) Math.ceil(wallpaper.cropHint.height() / wallpaper.mSampleSize));
if (croppedBitmapSize.equals(0, 0)) {
// There is an ImageWallpaper, but there are no crop hints and the bitmap size is
// unknown (e.g. the default wallpaper). Return a special "null" value that will be