| commit | 14648b579054b13802f06c56da202d6c6d2aae4a | [log] [tgz] |
|---|---|---|
| author | Brian Isganitis <brianji@google.com> | Thu Aug 05 01:27:29 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 05 01:27:29 2021 +0000 |
| tree | 34131c5fa05034c162385f739dd0418391baf14d | |
| parent | ab862a2fcd5ab27f724d1e96149e046a3f336876 [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: Ib2fe9cda54e21d35456f45c6a541cf4a42192b85
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; }