| commit | 07af48c5c374e80fa9408e75a92eff42d1e8d841 | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Thu Aug 05 01:39:00 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 01:39:00 2021 +0000 |
| tree | 52d839db78bc75f2b94ca2981f6e043fadffc360 | |
| parent | 6dd7241400d4d9a9d135a661afd88a5377c6eefc [diff] | |
| parent | 14648b579054b13802f06c56da202d6c6d2aae4a [diff] |
Merge "Fix crash from previewing launcher with unknown wallpaper colors." into sc-dev am: 200d7634d1 am: 14648b5790 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15462873 Change-Id: I0ffdcffff8e7232e0985a6450d508662bfd9bc1c
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java index 94778a2..bb726f8 100644 --- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java +++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -286,8 +286,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; }