From 9a3ecaf6decdfdcc28ee345d0682fea75418e5e1 Mon Sep 17 00:00:00 2001
From: Till Kottmann <deletescape@gmail.com>
Date: Sun, 9 Sep 2018 14:29:07 +0200
Subject: [PATCH] Prevent crashes if wallpapercolors are null

---
 .../launcher3/uioverrides/WallpaperColorInfoVOMR1.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfoVOMR1.java b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfoVOMR1.java
index 17422e73cd..4dd5c37be9 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfoVOMR1.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/WallpaperColorInfoVOMR1.java
@@ -60,7 +60,7 @@ public class WallpaperColorInfoVOMR1 extends WallpaperColorInfo implements OnCol
 
     @Override
     public int getActualMainColor() {
-        return mColors.getPrimaryColor().toArgb();
+        return mColors == null ? -1 : mColors.getPrimaryColor().toArgb();
     }
 
     @Override
@@ -70,13 +70,13 @@ public class WallpaperColorInfoVOMR1 extends WallpaperColorInfo implements OnCol
 
     @Override
     public int getActualSecondaryColor() {
-        Color secondary = mColors.getSecondaryColor();
+        Color secondary = mColors == null ? null : mColors.getSecondaryColor();
         return secondary == null ? -1 : secondary.toArgb();
     }
 
     @Override
     public int getTertiaryColor() {
-        Color tertiary = mColors.getTertiaryColor();
+        Color tertiary = mColors == null ? null : mColors.getTertiaryColor();
         return tertiary == null ? -1 : tertiary.toArgb();
     }