Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d570b3a authored by Jeff Hamilton's avatar Jeff Hamilton
Browse files

Don't crash if the cursor is null. 

Change-Id: Ibbacc97f781c1485599a5e11217527930d97fe2d
parent 074c11c1

core/java/android/provider/Contacts.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -533,7 +533,7 @@ public class Contacts { 
            Uri photoUri = Uri.withAppendedPath(person, Contacts.Photos.CONTENT_DIRECTORY);

            Uri photoUri = Uri.withAppendedPath(person, Contacts.Photos.CONTENT_DIRECTORY);

            Cursor cursor = cr.query(photoUri, new String[]{Photos.DATA}, null, null, null);

            Cursor cursor = cr.query(photoUri, new String[]{Photos.DATA}, null, null, null);

            try {

            try {

                if (!cursor.moveToNext()) {

                if (cursor == null || !cursor.moveToNext()) {

                    return null;

                    return null;

                }

                }

                byte[] data = cursor.getBlob(0);

                byte[] data = cursor.getBlob(0);