commit 9432471f632640c983a81604a33f3d07f5c4b7d6
author Jaikumar Ganesh <jaikumar@google.com> Tue Sep 21 18:40:00 2010 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Tue Sep 21 18:40:58 2010 -0700
tree 2f11c112d8bf7fb2994302c69c1585bb43918035
parent d066cb079485992fe7e45d19527d812d993a3bfb

More sanity checks based on NPE crashes on Android feedback.

Change-Id: I0f141ba8a2b78f38b0a870495675f8b0bc852fce

src/com/android/phone/BluetoothAtPhonebook.java

diff --git a/src/com/android/phone/BluetoothAtPhonebook.java b/src/com/android/phone/BluetoothAtPhonebook.java
index f9fb476..d11ee40 100644
--- a/src/com/android/phone/BluetoothAtPhonebook.java
+++ b/src/com/android/phone/BluetoothAtPhonebook.java
@@ -323,10 +323,6 @@
             }
         }
 
-        if (pbr.cursor == null) {
-            return null;
-        }
-
         return pbr;
     }
 
@@ -356,6 +352,8 @@
             pbr.cursor = mContext.getContentResolver().query(
                     Calls.CONTENT_URI, CALLS_PROJECTION, where, null,
                     Calls.DEFAULT_SORT_ORDER + " LIMIT " + MAX_PHONEBOOK_SIZE);
+            if (pbr.cursor == null) return false;
+
             pbr.numberColumn = pbr.cursor.getColumnIndexOrThrow(Calls.NUMBER);
             pbr.typeColumn = -1;
             pbr.nameColumn = -1;
@@ -368,6 +366,8 @@
                     .build();
             pbr.cursor = mContext.getContentResolver().query(uri, PHONES_PROJECTION, where, null,
                     Phone.NUMBER + " LIMIT " + MAX_PHONEBOOK_SIZE);
+            if (pbr.cursor == null) return false;
+
             pbr.numberColumn = pbr.cursor.getColumnIndex(Phone.NUMBER);
             pbr.typeColumn = pbr.cursor.getColumnIndex(Phone.TYPE);
             pbr.nameColumn = pbr.cursor.getColumnIndex(Phone.DISPLAY_NAME);