commit e9c612ed455fda2de85b292ec0cabc28862677c8
author Andrew Lee <anwlee@google.com> Tue Apr 01 14:46:30 2014 -0700
committer Andrew Lee <anwlee@google.com> Tue Apr 01 22:00:07 2014 +0000
tree 2ced49d66d7914ff304e474ad76acf29a9954e75
parent 32e17da029986b44092b8e226b9dc200dc85ecdb

Don't replace phone number text if formatted number is null.

Bug: 11734577
Change-Id: I21e11b9aed0dde06f96fcbdcc605cef0f2c4120f

src/com/android/contacts/common/list/ContactListItemView.java

diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 0217620..292e63a 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -1028,7 +1028,10 @@
             getDataView();
 
             if (countryIso != null) {
-                text = PhoneNumberUtils.formatNumber(text, countryIso);
+                String formattedText = PhoneNumberUtils.formatNumber(text, countryIso);
+                if (formattedText != null) {
+                    text = formattedText;
+                }
             }
 
             // Sets phone number texts for display after highlighting it, if applicable.