diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-15 22:42:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 22:42:00 +0000 |
| commit | e7cb204a462b2f3dd181c8a26d627d2bc1fc0e2c (patch) | |
| tree | e1a042e3da9992471a4d4018dc18b6f94c4f06c8 /src | |
| parent | a42cbbbd8b512591896c626bd9983a21b74d1ebb (diff) | |
| parent | 59a9a14678aaf85feca33570b6f98b5249bdbfde (diff) | |
am 59a9a146: am a396ed89: am becbb119: Merge "Fix abundance of "Custom" labels." into mnc-dev
* commit '59a9a14678aaf85feca33570b6f98b5249bdbfde':
Fix abundance of "Custom" labels.
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 |