From 1e54afcc1ac6c2c0ad2e1d08a89051c29b688bed Mon Sep 17 00:00:00 2001
From: Owen Kim <owenkmg@google.com>
Date: Mon, 7 Jun 2021 05:45:29 +0000
Subject: [PATCH] Revert "Only rescale wallpaper if its > display height"

Revert submission 14802973

Reason for revert: Droid cop: Possible culprits for Bug 190325415
Reverted Changes:
Ifc451f540:Cache set wallpaper as PNG instead of JPEG
Ifefd3e56d:Only rescale wallpaper if its > display height

Change-Id: If7c0b310a99189f8e80ca0b1049731edc9595696
---
 .../com/android/server/wallpaper/WallpaperManagerService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 6f2d020837f64..c888e545b24ea 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -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();