commit 0891d1fd9bb1eb67d608aec786f764b265b2f87a
author Tony Wickham <twickham@google.com> Wed Feb 15 14:53:08 2017 -0800
committer Tony Wickham <twickham@google.com> Wed Feb 15 14:53:08 2017 -0800
tree dbd0c3e2195f70d8a6180cb6ebe6b4e33a4831f7
parent a59402f98c0d3f85a45344657baa9b208e9eea32

Fallback to WallpaperManager#getDrawable() if getWallpaperFile() is null

Bug: 34521181
Change-Id: Ifc5f7cd9a11ff1f66acaadaea494ba4a0d142c3c

src/com/android/launcher3/dynamicui/ColorExtractionService.java

diff --git a/src/com/android/launcher3/dynamicui/ColorExtractionService.java b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
index 1a127dc..f94d442 100644
--- a/src/com/android/launcher3/dynamicui/ColorExtractionService.java
+++ b/src/com/android/launcher3/dynamicui/ColorExtractionService.java
@@ -98,7 +98,7 @@
                 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 @@
                 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);
             }
         }