commit c0cada0ce3e50c835dedba9c64db733e0b0a7109
author Tarun Nainani <tnainani@codeaurora.org> Fri Feb 06 17:42:58 2015 -0800
committer Tarun Nainani <tnainani@codeaurora.org> Mon Feb 09 16:36:17 2015 -0800
tree a791677de6fde255a7338238559ac2783b459cfe
parent 9e12e4092b34cb25c2413669ca8a3d7f71a88c06

Fix NPE for SuggestItem.

Issues-Fixed: SWE-3634

Change-Id: Ie28aa54090ab5d7a0c9bf3725368b67cdf1eb411

src/com/android/browser/SuggestionsAdapter.java

diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java
index 18a48b0..8ab78e2 100644
--- a/src/com/android/browser/SuggestionsAdapter.java
+++ b/src/com/android/browser/SuggestionsAdapter.java
@@ -212,7 +212,9 @@
             List<SuggestItem> results = new ArrayList<SuggestItem>();
             int count = cursor.getCount();
             for (int i = 0; i < count; i++) {
-                results.add(cursor.getItem());
+                SuggestItem item = cursor.getItem();
+                if(item != null)
+                    results.add(item);
                 cursor.moveToNext();
             }
             cursor.close();
@@ -306,7 +308,9 @@
                 maxLines -= n;
                 boolean more = false;
                 for (int j = 0; j < n; j++) {
-                    results.add(s.getItem());
+                    SuggestItem item = s.getItem();
+                    if(item != null)
+                        results.add(item);
                     more = s.moveToNext();
                 }
             }