commit 40ce6d2ccfaf8074756a7b16dfa9cf3c5f886045
author Santiago Etchebehere <santie@google.com> Tue Jun 08 18:41:35 2021 -0700
committer Santiago Etchebehere <santie@google.com> Tue Jun 08 18:41:35 2021 -0700
tree bceb2f7e012969fcc390c41671cb621c0440c7be
parent 1371b1a46e2f63283abb3af726055362a6ce4412

Do not use HARDWARE bitmaps to extract colors

Convert it if necessary before extracting color (similar to what
WallpaperColorsLoader does)

Bug: 187721574
Test: manual
Change-Id: I1aeb5e9808d94d768b91aceaf1a6dd507f93f109

src/com/android/wallpaper/picker/ImagePreviewFragment.java

diff --git a/src/com/android/wallpaper/picker/ImagePreviewFragment.java b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
index 28a8d25..b0a5a4f 100755
--- a/src/com/android/wallpaper/picker/ImagePreviewFragment.java
+++ b/src/com/android/wallpaper/picker/ImagePreviewFragment.java
@@ -377,7 +377,16 @@
                 new BitmapCropper.Callback() {
                     @Override
                     public void onBitmapCropped(Bitmap croppedBitmap) {
-                        onWallpaperColorsChanged(WallpaperColors.fromBitmap(croppedBitmap));
+                        boolean shouldRecycle = false;
+                        if (croppedBitmap.getConfig() == Bitmap.Config.HARDWARE) {
+                            croppedBitmap = croppedBitmap.copy(Bitmap.Config.ARGB_8888, false);
+                            shouldRecycle = true;
+                        }
+                        WallpaperColors colors = WallpaperColors.fromBitmap(croppedBitmap);
+                        if (shouldRecycle) {
+                            croppedBitmap.recycle();
+                        }
+                        onWallpaperColorsChanged(colors);
                     }
 
                     @Override