Merge "DO NOT MERGE Add back Yenta experiment (1/2)" into ub-contactsdialer-i-dev
diff --git a/src/com/android/contacts/editor/PickRawContactLoader.java b/src/com/android/contacts/editor/PickRawContactLoader.java
index bc4fd87..e43d02b 100644
--- a/src/com/android/contacts/editor/PickRawContactLoader.java
+++ b/src/com/android/contacts/editor/PickRawContactLoader.java
@@ -99,6 +99,11 @@
             return null;
         }
 
+        if (rawContactCursor.getCount() < 1) {
+            rawContactCursor.close();
+            return null;
+        }
+
         rawContactCursor.moveToPosition(-1);
         final StringBuilder photoSelection = new StringBuilder(PHOTO_SELECTION_PREFIX);
         final Map<Long, RawContact> rawContactMap = new HashMap<>();