am 33728557: am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

Merge commit '33728557540d9033ff396f7a2ddd4fb304fdedcd'

* commit '33728557540d9033ff396f7a2ddd4fb304fdedcd':
  Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

1 files changed, 5 insertions, 17 deletions

diff --git a/core/java/android/pim/vcard/ContactStruct.java b/core/java/android/pim/vcard/ContactStruct.java
index 9d40db6..4069729 100644
--- a/core/java/android/pim/vcard/ContactStruct.java
+++ b/core/java/android/pim/vcard/ContactStruct.java
@@ -480,23 +480,11 @@ public class ContactStruct {
             }
         }
 
-        final String formattedPhoneNumber;
-        {
-            final String rawPhoneNumber = builder.toString();
-            if (VCardConfig.isJapaneseDevice(mVCardType)) {
-                // As of 2009-10-07, there's no formatNumber() which accepts
-                // the second argument and returns String directly. 
-                final SpannableStringBuilder tmpBuilder =
-                    new SpannableStringBuilder(rawPhoneNumber);
-                PhoneNumberUtils.formatNumber(tmpBuilder, PhoneNumberUtils.FORMAT_JAPAN);
-                formattedPhoneNumber = tmpBuilder.toString();
-            } else {
-                // There's no information available on vCard side. Depend on the default
-                // behavior, which may cause problem in the future when the additional format
-                // rule is supported (e.g. PhoneNumberUtils.FORMAT_KLINGON)
-                formattedPhoneNumber = PhoneNumberUtils.formatNumber(rawPhoneNumber);
-            }
-        }
+        // Use NANP in default when there's no information about locale.
+        final int formattingType = (VCardConfig.isJapaneseDevice(mVCardType) ?
+                PhoneNumberUtils.FORMAT_JAPAN : PhoneNumberUtils.FORMAT_NANP);
+        final String formattedPhoneNumber =
+                PhoneNumberUtils.formatNumber(builder.toString(), formattingType);
         PhoneData phoneData = new PhoneData(type, formattedPhoneNumber, label, isPrimary);
         mPhoneList.add(phoneData);
     }