From aaffa8b4d4d3530e02cd6a0619b0c1485c133e55 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Sat, 30 Oct 2010 14:04:05 -0700
Subject: Adding NPE check when calculating remote views memory usage.

Change-Id: I9fd4b980e45cadb980ba20d5ef1ddf150639853a
---
 core/java/android/widget/RemoteViewsAdapter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'core/java/android/widget/RemoteViewsAdapter.java')

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;
         }
-- 
cgit v1.2.3