commit 200d7634d1af453c1b8e8e9ce2aa165dea5802f6
author Brian Isganitis <brianji@google.com> Thu Aug 05 01:08:00 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 05 01:08:00 2021 +0000
tree 5c735028f2140fbd32acf6b48d6b4af7965d5d77
parent 5fc53cbc222bd846e21a2a0faa1ef73a6fb033a7
parent dafa5040ef2cf933201b8b77c3f7ced35ea5adae

Merge "Fix crash from previewing launcher with unknown wallpaper colors." into sc-dev

src/com/android/launcher3/graphics/LauncherPreviewRenderer.java

diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index a387f04..7a31ea0 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -268,8 +268,8 @@
             WallpaperColors wallpaperColors = wallpaperColorsOverride != null
                     ? wallpaperColorsOverride
                     : WallpaperManager.getInstance(context).getWallpaperColors(FLAG_SYSTEM);
-            mWallpaperColorResources = LocalColorExtractor.newInstance(context)
-                    .generateColorsOverride(wallpaperColors);
+            mWallpaperColorResources = wallpaperColors != null ? LocalColorExtractor.newInstance(
+                    context).generateColorsOverride(wallpaperColors) : null;
         } else {
             mWallpaperColorResources = null;
         }