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

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

Merge change 23344 into eclair 

* changes:
  Make vCard composer handle null of Photo entry correctly.
parents cedcb135 f75c94f7

core/java/android/pim/vcard/VCardComposer.java

+3 −0
Original line number Diff line number Diff line
@@ -967,6 +967,9 @@ public class VCardComposer { 
        if (contentValuesList != null) {

            for (ContentValues contentValues : contentValuesList) {

                byte[] data = contentValues.getAsByteArray(Photo.PHOTO);

                if (data == null) {

                    continue;

                }

                final String photoType;

                // Use some heuristics for guessing the format of the image.

                // TODO: there should be some general API for detecting the file format.