diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-15 21:30:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-15 21:30:31 +0000 |
| commit | becbb119bdcd96257106b990ce84bac99388deac (patch) | |
| tree | 8061827cb884937422a83c0380058d5c26ff8164 /src | |
| parent | 7eb56cec2df622a012f1f164934d67cb555bbc7c (diff) | |
| parent | e224017d69630c3b3aea2667e26ab91bb9ecc0be (diff) | |
Merge "Fix abundance of "Custom" labels." into mnc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/dialer/PhoneCallDetailsHelper.java | 6 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/ContactInfo.java | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index c8206227a..68b47afcf 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -181,11 +181,11 @@ public class PhoneCallDetailsHelper { && !mPhoneNumberUtilsWrapper.isVoicemailNumber(details.accountHandle, details.number)) { - if (details.numberLabel == ContactInfo.GEOCODE_AS_LABEL) { + if (TextUtils.isEmpty(details.name) && !TextUtils.isEmpty(details.geocode)) { numberFormattedLabel = details.geocode; } else { - numberFormattedLabel = Phone.getTypeLabel(mResources, details.numberType, - details.numberLabel); + numberFormattedLabel = Phone.getTypeLabel( + mResources, details.numberType, details.numberLabel); } } diff --git a/src/com/android/dialer/calllog/ContactInfo.java b/src/com/android/dialer/calllog/ContactInfo.java index effe14270..357c832cf 100644 --- a/src/com/android/dialer/calllog/ContactInfo.java +++ b/src/com/android/dialer/calllog/ContactInfo.java @@ -48,8 +48,6 @@ public class ContactInfo { public static ContactInfo EMPTY = new ContactInfo(); - public static String GEOCODE_AS_LABEL = ""; - public int sourceType = 0; @Override |