Adding NPE check when calculating remote views memory usage.

Change-Id: I9fd4b980e45cadb980ba20d5ef1ddf150639853a

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/widget/RemoteViewsAdapter.java b/core/java/android/widget/RemoteViewsAdapter.java
index 40ac76c6eccd..5c3561feb030 100644
--- a/core/java/android/widget/RemoteViewsAdapter.java
+++ b/core/java/android/widget/RemoteViewsAdapter.java
@@ -470,7 +470,9 @@ public class RemoteViewsAdapter extends BaseAdapter {
             int mem = 0;
             for (Integer i : mIndexRemoteViews.keySet()) {
                 final RemoteViews v = mIndexRemoteViews.get(i);
-                mem += v.estimateBitmapMemoryUsage();
+                if (v != null) {
+                    mem += v.estimateBitmapMemoryUsage();
+                }
             }
             return mem;
         }