commit d7fdda2f06544fd6a1972d7d0727625ac91e2095
author Jaikumar Ganesh <jaikumar@google.com> Fri Nov 13 12:10:19 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 13 12:10:19 2009 -0800
tree 42a027761690dd363ffafe84de613bbcb7e5ba73
parent e351da6cde9a0e63ad696ece5d963428ec5209fb
parent 9284dec737da58a92b3aa916a357e700d291a68a

am 9284dec7: Merge change I4c05ba1f into eclair

Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp

* commit '9284dec737da58a92b3aa916a357e700d291a68a':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf

core/java/android/pim/vcard/VCardComposer.java

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 @@
         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);