From 0891d1fd9bb1eb67d608aec786f764b265b2f87a Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Wed, 15 Feb 2017 14:53:08 -0800
Subject: [PATCH] Fallback to WallpaperManager#getDrawable() if
 getWallpaperFile() is null

Bug: 34521181
Change-Id: Ifc5f7cd9a11ff1f66acaadaea494ba4a0d142c3c
---
 src/com/android/launcher3/dynamicui/ColorExtractionService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/dynamicui/ColorExtractionService.java b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
index 1a127dc8f..f94d442e0 100644
--- a/src/com/android/launcher3/dynamicui/ColorExtractionService.java
+++ b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
@@ -98,7 +98,7 @@ public class ColorExtractionService extends IntentService {
                 if (bitmap != null) {
                     return Palette.from(bitmap).clearFilters().generate();
                 }
-            } catch (IOException e) {
+            } catch (IOException | NullPointerException e) {
                 Log.e(TAG, "Fetching partial bitmap failed, trying old method", e);
             }
         }
@@ -129,7 +129,7 @@ public class ColorExtractionService extends IntentService {
                 if (bitmap != null) {
                     return Palette.from(bitmap).clearFilters().generate();
                 }
-            } catch (IOException e) {
+            } catch (IOException | NullPointerException e) {
                 Log.e(TAG, "Fetching partial bitmap failed, trying old method", e);
             }
         }
-- 
2.11.0