commit fe7a8f0e9efd3d7464184761b83d01ff883fa821
author Jay Shrauner <shrauner@google.com> Mon Mar 03 22:28:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 03 22:28:26 2014 +0000
tree 6ed9f6802b51abd3914c0d6cd3968faf583032b6
parent bb650e8f962934f81d176bf7f83aeedaf1108a00
parent 243ab2f22eb25fd35a936e8a62808cad935bb510

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

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