From f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778 Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Tue, 1 Sep 2009 07:17:20 +0900
Subject: [PATCH] Make vCard composer handle null of Photo entry correctly.

Internal bug id: 2088922
---
 core/java/android/pim/vcard/VCardComposer.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java
index 283d00b328595..5a09c64ff722c 100644
--- a/core/java/android/pim/vcard/VCardComposer.java
+++ b/core/java/android/pim/vcard/VCardComposer.java
@@ -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.