Merge change 25503 into eclair

* changes:
  Don't crash if the cursor is null.

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