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

Commit 4358731c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22534 into eclair 

* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
parents 0badd0b7 7d6eb9a4

core/java/android/provider/ContactsContract.java

+4 −2
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ public final class ContactsContract { 
            Cursor cursor = cr.query(photoUri,

                    new String[]{ContactsContract.CommonDataKinds.Photo.PHOTO}, null, null, null);

            try {

                if (!cursor.moveToNext()) {

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

                    return null;

                }

                byte[] data = cursor.getBlob(0);
@@ -352,10 +352,12 @@ public final class ContactsContract { 
                }

                return new ByteArrayInputStream(data);

            } finally {

                if (cursor != null) {

                    cursor.close();

                }

            }

        }

    }



    private interface RawContactsColumns {

        /**