Merge "Fixing issue where you couldn't set null RemoteViews for a widget" into jb-dev

2012-07-16 15:29:44 -07:00
parent eb67279637 e582746621
commit c80f72f75e
1 changed files with 4 additions and 1 deletions
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -819,7 +819,10 @@ class AppWidgetServiceImpl {
            return;
        }

-        int bitmapMemoryUsage = views.estimateMemoryUsage();
+        int bitmapMemoryUsage = 0;
+        if (views != null) {
+            bitmapMemoryUsage = views.estimateMemoryUsage();
+        }
        if (bitmapMemoryUsage > mMaxWidgetBitmapMemory) {
            throw new IllegalArgumentException("RemoteViews for widget update exceeds maximum" +
                    " bitmap memory usage (used: " + bitmapMemoryUsage + ", max: " +