commit 7bff792a54ddbfa989a33e3744d1378e89de2601
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:35:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:35:04 2014 +0000
tree 2eea6e7c206a8b366cb20eb13306a773fa97208d
parent 6625597404762d46aec5ea80cc49fdd9917433c9
parent c0078359f1037459c7125c4e934beca1cc74e309

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

* commit 'c0078359f1037459c7125c4e934beca1cc74e309':
  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);