commit 66d9755fea8005338d08f038eb0882485d3e7c8d
author Andrew Lee <anwlee@google.com> Thu Jun 18 21:02:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 18 21:02:36 2015 +0000
tree b3e528a245157e98ed4e641fe6b87fe0a5fb6589
parent 1740da06b6991ecc15996c86646228367ae9ee28
parent e5c095183b71758c251f7e74ae7b909f46f0dc0a

am e5c09518: am f3cf7229: am 5e193896: Merge "Do not set type label if "Custom"." into mnc-dev

* commit 'e5c095183b71758c251f7e74ae7b909f46f0dc0a':
  Do not set type label if "Custom".

src/com/android/dialer/PhoneCallDetailsHelper.java

diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index 68b47af..672a1c8 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -183,7 +183,9 @@
 
             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);
             }