diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-13 12:06:29 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-13 12:06:29 -0800 |
| commit | 9284dec737da58a92b3aa916a357e700d291a68a (patch) | |
| tree | 09da7b8fef7ffbb7265b2218b1d91d5ebfe76939 /core/java/android | |
| parent | 27d6e65b71f515deafbd93d5aa98732898c34ddf (diff) | |
| parent | 4c05ba1fcc6abcf199fc82505465a97fc7de553d (diff) | |
| download | frameworks_base-9284dec737da58a92b3aa916a357e700d291a68a.zip frameworks_base-9284dec737da58a92b3aa916a357e700d291a68a.tar.gz frameworks_base-9284dec737da58a92b3aa916a357e700d291a68a.tar.bz2 | |
Merge change I4c05ba1f into eclair
* changes:
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/pim/vcard/VCardComposer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/pim/vcard/VCardComposer.java b/core/java/android/pim/vcard/VCardComposer.java index f9dce25..7807595 100644 --- a/core/java/android/pim/vcard/VCardComposer.java +++ b/core/java/android/pim/vcard/VCardComposer.java @@ -414,8 +414,10 @@ public class VCardComposer { appendVCardLine(builder, VCARD_PROPERTY_FULL_NAME, phoneName, needCharset, false); appendVCardLine(builder, VCARD_PROPERTY_NAME, phoneName, needCharset, false); - String label = Integer.toString(phonetype); - appendVCardTelephoneLine(builder, phonetype, label, phoneNumber); + if (!TextUtils.isEmpty(phoneNumber)) { + String label = Integer.toString(phonetype); + appendVCardTelephoneLine(builder, phonetype, label, phoneNumber); + } appendVCardLine(builder, VCARD_PROPERTY_END, VCARD_DATA_VCARD); |