commit a12a634a7d258a0297b9175ca0bf52dcbe14c210
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:41:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:41:30 2014 +0000
tree 2eea6e7c206a8b366cb20eb13306a773fa97208d
parent 59b3d2bde01ed34a35a82271ae15f50b3b3a6f5f
parent 60785e8700b6877e4d57955e6759b4ebafe6f094

am 60785e87: am 7bff792a: am c0078359: am fe7a8f0e: am 243ab2f2: Merge "Add null check for cursor in UndemoteOutgoingCallReceiver" into klp-dev

* commit '60785e8700b6877e4d57955e6759b4ebafe6f094':
  Add null check for cursor in UndemoteOutgoingCallReceiver

src/com/android/dialer/interactions/UndemoteOutgoingCallReceiver.java

diff --git a/src/com/android/dialer/interactions/UndemoteOutgoingCallReceiver.java b/src/com/android/dialer/interactions/UndemoteOutgoingCallReceiver.java
index fb9b1d1..c7e4c5f 100644
--- a/src/com/android/dialer/interactions/UndemoteOutgoingCallReceiver.java
+++ b/src/com/android/dialer/interactions/UndemoteOutgoingCallReceiver.java
@@ -68,6 +68,9 @@
                 Uri.encode(number));
         final Cursor cursor = context.getContentResolver().query(contactUri, new String[] {
                 PhoneLookup._ID}, null, null, null);
+        if (cursor == null) {
+            return NO_CONTACT_FOUND;
+        }
         try {
             if (cursor.moveToFirst()) {
                 final long id = cursor.getLong(0);