Merge change 23344 into eclair
* changes: Make vCard composer handle null of Photo entry correctly.
This commit is contained in:
@@ -967,6 +967,9 @@ public class VCardComposer {
|
|||||||
if (contentValuesList != null) {
|
if (contentValuesList != null) {
|
||||||
for (ContentValues contentValues : contentValuesList) {
|
for (ContentValues contentValues : contentValuesList) {
|
||||||
byte[] data = contentValues.getAsByteArray(Photo.PHOTO);
|
byte[] data = contentValues.getAsByteArray(Photo.PHOTO);
|
||||||
|
if (data == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
final String photoType;
|
final String photoType;
|
||||||
// Use some heuristics for guessing the format of the image.
|
// Use some heuristics for guessing the format of the image.
|
||||||
// TODO: there should be some general API for detecting the file format.
|
// TODO: there should be some general API for detecting the file format.
|
||||||
|
|||||||
Reference in New Issue
Block a user