diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-09-01 07:17:20 +0900 |
|---|---|---|
| committer | Daisuke Miyakawa <dmiyakawa@google.com> | 2009-09-01 07:17:20 +0900 |
| commit | f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778 (patch) | |
| tree | 2399d606a72967e404cc3bf6693492614ddc8e6e /core/java/android/pim/vcard | |
| parent | ee0e24c1052f300a2a02e80327769dddd173a7b1 (diff) | |
| download | frameworks_base-f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778.zip frameworks_base-f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778.tar.gz frameworks_base-f75c94f7a9ff6fbc898162d3c9d94e8ac41dd778.tar.bz2 | |
Make vCard composer handle null of Photo entry correctly.
Internal bug id: 2088922
Diffstat (limited to 'core/java/android/pim/vcard')
| -rw-r--r-- | core/java/android/pim/vcard/VCardComposer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index 283d00b..5a09c64 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. |