Merge "Remove unneeded PhoneNumberHelper methods"
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/common/util/PhoneNumberHelper.java
index 9d67668..24223d0 100644
--- a/src/com/android/contacts/common/util/PhoneNumberHelper.java
+++ b/src/com/android/contacts/common/util/PhoneNumberHelper.java
@@ -53,85 +53,6 @@
}
/**
- * Formats the phone number only if the given number hasn't been formatted.
- * <p>
- * The number which has only dailable character is treated as not being
- * formatted.
- *
- * @param phoneNumber the number to be formatted.
- * @param phoneNumberE164 The E164 format number whose country code is used if the given
- * phoneNumber doesn't have the country code.
- * @param defaultCountryIso The ISO 3166-1 two letters country code whose convention will
- * be used if the phoneNumberE164 is null or invalid, or if phoneNumber contains IDD.
- * @return The formatted number if the given number has been formatted, otherwise, return the
- * given number.
- *
- * TODO: Remove if PhoneNumberUtils.formatNumber(String phoneNumber, String phoneNumberE164,
- * String defaultCountryIso) is made public.
- */
- public static String formatNumber(
- String phoneNumber, String phoneNumberE164, String defaultCountryIso) {
- int len = phoneNumber.length();
- for (int i = 0; i < len; i++) {
- if (!PhoneNumberUtils.isDialable(phoneNumber.charAt(i))) {
- return phoneNumber;
- }
- }
- PhoneNumberUtil util = PhoneNumberUtil.getInstance();
- // Get the country code from phoneNumberE164
- if (phoneNumberE164 != null && phoneNumberE164.length() >= 2
- && phoneNumberE164.charAt(0) == '+') {
- try {
- // The number to be parsed is in E164 format, so the default region used doesn't
- // matter.
- PhoneNumber pn = util.parse(phoneNumberE164, "ZZ");
- String regionCode = util.getRegionCodeForNumber(pn);
- if (!TextUtils.isEmpty(regionCode) &&
- // This makes sure phoneNumber doesn't contain an IDD
- normalizeNumber(phoneNumber).indexOf(phoneNumberE164.substring(1)) <= 0) {
- defaultCountryIso = regionCode;
- }
- } catch (NumberParseException e) {
- Log.w(LOG_TAG, "The number could not be parsed in E164 format!");
- }
- }
-
- String result = formatNumber(phoneNumber, defaultCountryIso);
- return result == null ? phoneNumber : result;
- }
-
- /**
- * Format a phone number.
- * <p>
- * If the given number doesn't have the country code, the phone will be
- * formatted to the default country's convention.
- *
- * @param phoneNumber The number to be formatted.
- * @param defaultCountryIso The ISO 3166-1 two letters country code whose convention will
- * be used if the given number doesn't have the country code.
- * @return The formatted number, or null if the given number is not valid.
- *
- * TODO: Remove if PhoneNumberUtils.formatNumber(String phoneNumber, String defaultCountryIso)
- * is made public.
- */
- public static String formatNumber(String phoneNumber, String defaultCountryIso) {
- // Do not attempt to format numbers that start with a hash or star symbol.
- if (phoneNumber.startsWith("#") || phoneNumber.startsWith("*")) {
- return phoneNumber;
- }
-
- final PhoneNumberUtil util = PhoneNumberUtil.getInstance();
- String result = null;
- try {
- PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
- result = util.formatInOriginalFormat(pn, defaultCountryIso);
- } catch (NumberParseException e) {
- Log.w(LOG_TAG, "Number could not be parsed with the given country code!");
- }
- return result;
- }
-
- /**
* Normalize a phone number by removing the characters other than digits. If
* the given number has keypad letters, the letters will be converted to
* digits first.