diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-10-27 22:04:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-27 22:04:51 +0000 |
| commit | ec5a42e1ac0f1887a1548a5baa39d93fddaf4ecb (patch) | |
| tree | 6d6eef79f3ef01abe1d71d8dedc3261850238486 /src/com/android/launcher3/WidgetPreviewLoader.java | |
| parent | 968c283f22201c27249fa1ce4c39e49876475519 (diff) | |
| parent | 2570d107f55090c0b47476b4b41ef18344fc9360 (diff) | |
| download | packages_apps_Trebuchet-ec5a42e1ac0f1887a1548a5baa39d93fddaf4ecb.tar.gz packages_apps_Trebuchet-ec5a42e1ac0f1887a1548a5baa39d93fddaf4ecb.tar.bz2 packages_apps_Trebuchet-ec5a42e1ac0f1887a1548a5baa39d93fddaf4ecb.zip | |
Merge "Catching OOM during widget preview generation" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/WidgetPreviewLoader.java')
| -rw-r--r-- | src/com/android/launcher3/WidgetPreviewLoader.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 7b7b0aad0..354b8ec41 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -301,7 +301,14 @@ public class WidgetPreviewLoader { Drawable drawable = null; if (info.previewImage != 0) { - drawable = mWidgetManager.loadPreview(info); + try { + drawable = mWidgetManager.loadPreview(info); + } catch (OutOfMemoryError e) { + Log.w(TAG, "Error loading widget preview for: " + info.provider, e); + // During OutOfMemoryError, the previous heap stack is not affected. Catching + // an OOM error here should be safe & not affect other parts of launcher. + drawable = null; + } if (drawable != null) { drawable = mutateOnMainThread(drawable); } else { |