commit 2570d107f55090c0b47476b4b41ef18344fc9360
author Sunny Goyal <sunnygoyal@google.com> Thu Oct 27 11:38:45 2016 -0700
committer Sunny Goyal <sunnygoyal@google.com> Thu Oct 27 11:39:14 2016 -0700
tree 84db729da36f64834e0c137afbad914f17a0fe71
parent 9ccafbff26f5835ab9725d876d1bf7ccd08ccf84

Catching OOM during widget preview generation

Bug: 32365481
Change-Id: Ifc49b033c3ad83213d50793301d94bb6337a412d

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 45e65b5..cc9dde1 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -301,7 +301,14 @@
 
         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 {