diff options
author | Marcos Marado <mmarado@cyngn.com> | 2016-10-18 18:05:24 +0100 |
---|---|---|
committer | Marcos Marado <mmarado@cyngn.com> | 2016-10-18 18:09:08 +0100 |
commit | da2682ef9fed8115aa2ad5a7e8f306bb6a2d3c6f (patch) | |
tree | c2a0386db5135edc4f9c8ff50204cb65b51c3a3b /src | |
parent | 7744f5ca537a1a1a12ebb5afeb2cd6c3b9fd4959 (diff) | |
download | android_packages_apps_ContactsCommon-da2682ef9fed8115aa2ad5a7e8f306bb6a2d3c6f.tar.gz android_packages_apps_ContactsCommon-da2682ef9fed8115aa2ad5a7e8f306bb6a2d3c6f.tar.bz2 android_packages_apps_ContactsCommon-da2682ef9fed8115aa2ad5a7e8f306bb6a2d3c6f.zip |
PhoneNumberHelper: formatNumber: check if isEmpty
If formatNumber is invoked with an empty number, then there's no
formatting to be done. This patch avoids an NPE while trying to parse
an inexistent string.
Change-Id: Ic7a9dd3d1e0e7b27457f59f1209387b7faa359d9
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/contacts/common/util/PhoneNumberHelper.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/util/PhoneNumberHelper.java b/src/com/android/contacts/common/util/PhoneNumberHelper.java index 39f8a39b..3c057052 100644 --- a/src/com/android/contacts/common/util/PhoneNumberHelper.java +++ b/src/com/android/contacts/common/util/PhoneNumberHelper.java @@ -118,8 +118,10 @@ public class PhoneNumberHelper { * 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("*")) { + // Do not attempt to format numbers that are empty or start with a hash + // or star symbol. + if (TextUtils.isEmpty(phoneNumber) || phoneNumber.startsWith("#") || + phoneNumber.startsWith("*")) { return phoneNumber; } |