| commit | 36af576d7c7b93253b31d6c5d0603962e7e2a0e5 | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Thu Aug 05 01:27:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 01:27:13 2021 +0000 |
| tree | 478523bef893f81d85955dd9fce0dc24fd54cf60 | |
| parent | 4dd79f1bde9553c136c023b674e9905570f126eb [diff] | |
| parent | 200d7634d1af453c1b8e8e9ce2aa165dea5802f6 [diff] |
Merge "Fix crash from previewing launcher with unknown wallpaper colors." into sc-dev am: 200d7634d1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15462873 Change-Id: Ied267f8cd7e6176a2f7ce00b9f1b92293deafdac
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; }