From 8d570b3a246cbc18be7046763c213b57dcb3e103 Mon Sep 17 00:00:00 2001 From: Jeff Hamilton Date: Thu, 17 Sep 2009 11:51:32 -0500 Subject: [PATCH] Don't crash if the cursor is null. Change-Id: Ibbacc97f781c1485599a5e11217527930d97fe2d --- core/java/android/provider/Contacts.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java index 667ec5ad284d7..d87018d137c5a 100644 --- a/core/java/android/provider/Contacts.java +++ b/core/java/android/provider/Contacts.java @@ -533,7 +533,7 @@ public class Contacts { Uri photoUri = Uri.withAppendedPath(person, Contacts.Photos.CONTENT_DIRECTORY); Cursor cursor = cr.query(photoUri, new String[]{Photos.DATA}, null, null, null); try { - if (!cursor.moveToNext()) { + if (cursor == null || !cursor.moveToNext()) { return null; } byte[] data = cursor.getBlob(0);