summaryrefslogtreecommitdiffstats
path: root/core/java/android/pim
diff options
context:
space:
mode:
authorDaisuke Miyakawa <dmiyakawa@google.com>2009-10-08 17:29:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-08 17:29:32 -0700
commitbd3d5b25bff3504b4158dade39dc2384d7aeb77a (patch)
treeadc96943aac9f28ab00990fe3668556cccf86b53 /core/java/android/pim
parent2d295a9601315a2610a2cb759ed9a4f787e7d4b5 (diff)
parent387e73bd8fbecae0b95e3005ca8187ddbda1aff7 (diff)
downloadframeworks_base-bd3d5b25bff3504b4158dade39dc2384d7aeb77a.zip
frameworks_base-bd3d5b25bff3504b4158dade39dc2384d7aeb77a.tar.gz
frameworks_base-bd3d5b25bff3504b4158dade39dc2384d7aeb77a.tar.bz2
am 387e73bd: Merge change Ib977f2bd into eclair
Merge commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7' into eclair-mr2 * commit '387e73bd8fbecae0b95e3005ca8187ddbda1aff7': Make vCard import Photo from vCard file :(
Diffstat (limited to 'core/java/android/pim')
-rw-r--r--core/java/android/pim/vcard/ContactStruct.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java
index b6a453a..36e5e23 100644
--- a/core/java/android/pim/vcard/ContactStruct.java
+++ b/core/java/android/pim/vcard/ContactStruct.java
@@ -698,6 +698,7 @@ public class ContactStruct {
mPhotoList = new ArrayList<PhotoData>(1);
}
final PhotoData photoData = new PhotoData(0, null, photoBytes);
+ mPhotoList.add(photoData);
}
/**