commit 05661918eb54ed76081a7230ab0d51bdf9adc001
author Tony Wickham <twickham@google.com> Thu Feb 16 16:38:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 16:38:59 2017 +0000
tree 41e3c97c644f1a0550bb712c439df07da8efc1e5
parent 0891d1fd9bb1eb67d608aec786f764b265b2f87a
parent 7aefaae5d9e0938e5268238d397d40d8959dc7ba

Merge "Ignore touches before notification is populated" into ub-launcher3-master

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);
             }
         }