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