diff options
| author | Tony Wickham <twickham@google.com> | 2017-02-15 14:53:08 -0800 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-02-15 14:53:08 -0800 |
| commit | 0891d1fd9bb1eb67d608aec786f764b265b2f87a (patch) | |
| tree | dbd0c3e2195f70d8a6180cb6ebe6b4e33a4831f7 | |
| parent | a59402f98c0d3f85a45344657baa9b208e9eea32 (diff) | |
| download | android_packages_apps_Trebuchet-0891d1fd9bb1eb67d608aec786f764b265b2f87a.tar.gz android_packages_apps_Trebuchet-0891d1fd9bb1eb67d608aec786f764b265b2f87a.tar.bz2 android_packages_apps_Trebuchet-0891d1fd9bb1eb67d608aec786f764b265b2f87a.zip | |
Fallback to WallpaperManager#getDrawable() if getWallpaperFile() is null
Bug: 34521181
Change-Id: Ifc5f7cd9a11ff1f66acaadaea494ba4a0d142c3c
| -rw-r--r-- | src/com/android/launcher3/dynamicui/ColorExtractionService.java | 4 |
1 files 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); } } |