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

Commit 63deedad authored by Santiago Etchebehere's avatar Santiago Etchebehere Committed by android-build-merger
Browse files

Fix crash extracting wallpaper color 

am: 23b88fa0

Change-Id: I8466168bbab17105d0b097cad00a8c317a25438d
parents 8056fb91 23b88fa0

src/com/android/customization/picker/theme/ThemeFragment.java

+9 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Intent; 
import android.content.res.ColorStateList;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.Bitmap.Config;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;
@@ -568,7 +569,15 @@ public class ThemeFragment extends ToolbarFragment { 
                }

                view.findViewById(R.id.theme_preview_card_background).setBackground(background);

                if (mScrim == null && !mIsTranslucent) {

                    boolean shouldRecycle = false;

                    if (bitmap.getConfig() == Config.HARDWARE) {

                        bitmap = bitmap.copy(Config.ARGB_8888, false);

                        shouldRecycle = true;

                    }

                    int colorsHint = WallpaperColors.fromBitmap(bitmap).getColorHints();

                    if (shouldRecycle) {

                        bitmap.recycle();

                    }

                    TextView header = view.findViewById(R.id.theme_preview_card_header);

                    if ((colorsHint & WallpaperColors.HINT_SUPPORTS_DARK_TEXT) == 0) {

                        int colorLight = res.getColor(R.color.text_color_light, null);