commit f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778
author Daisuke Miyakawa <dmiyakawa@google.com> Tue Sep 01 07:17:20 2009 +0900
committer Daisuke Miyakawa <dmiyakawa@google.com> Tue Sep 01 07:17:20 2009 +0900
tree 2399d606a72967e404cc3bf6693492614ddc8e6e
parent ee0e24c1052f300a2a02e80327769dddd173a7b1

Make vCard composer handle null of Photo entry correctly.

Internal bug id: 2088922

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

diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index 283d00b..5a09c64f 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -967,6 +967,9 @@
         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.