diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-18 20:51:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-18 20:51:50 +0000 |
| commit | e5c095183b71758c251f7e74ae7b909f46f0dc0a (patch) | |
| tree | be7d16e1a1526f079e68f01651b366beb36465c2 | |
| parent | 62d27683c748cdde235898475386125fa3986aec (diff) | |
| parent | f3cf7229bb2d6904c6c50a1d6de774d1da0c452b (diff) | |
am f3cf7229: am 5e193896: Merge "Do not set type label if "Custom"." into mnc-dev
* commit 'f3cf7229bb2d6904c6c50a1d6de774d1da0c452b':
Do not set type label if "Custom".
| -rw-r--r-- | src/com/android/dialer/PhoneCallDetailsHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java index 68b47afcf..672a1c8e9 100644 --- a/src/com/android/dialer/PhoneCallDetailsHelper.java +++ b/src/com/android/dialer/PhoneCallDetailsHelper.java @@ -183,7 +183,9 @@ public class PhoneCallDetailsHelper { if (TextUtils.isEmpty(details.name) && !TextUtils.isEmpty(details.geocode)) { numberFormattedLabel = details.geocode; - } else { + } else if (!(details.numberType == Phone.TYPE_CUSTOM + && TextUtils.isEmpty(details.numberLabel))) { + // Get type label only if it will not be "Custom" because of an empty number label. numberFormattedLabel = Phone.getTypeLabel( mResources, details.numberType, details.numberLabel); } |