commit 7983206661f065342767bb4141d7a924323b2933
author Yorke Lee <yorkelee@google.com> Tue Dec 17 18:18:49 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 17 18:18:50 2013 +0000
tree 44fe69ea57758d8e336105fe2904584a9047d5b1
parent 80d78a876463fcdadb1f5cbd69073f9129577117
parent 3fee3e5a6ac02e4ddc536e4739d336341d22e19a

Merge "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);