commit 1b858f2dd10e04699440dfb44b6bd8d751a433d1
author Android Dialer <noreply@google.com> Mon Jun 19 13:19:40 2017 -0700
committer Eric Erfanian <erfanian@google.com> Tue Jun 20 15:23:49 2017 +0000
tree 0165e64c71710bb4ba6112d73c84bee476e807d8
parent 2d6bc36921c4a41b17bc1870c133ee42f1388b51

Fix bug that number is duplicated until location is resolved.

Number shouldn't be shown in bottom row if it's already shown on name row.

Test: TH

PiperOrigin-RevId: 159468064
Change-Id: Ieb3eff270d247dd712d2fbf6fe2428038ba643c3

java/com/android/incallui/contactgrid/BottomRow.java

diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java
index d0ff192..76e0289 100644
--- a/java/com/android/incallui/contactgrid/BottomRow.java
+++ b/java/com/android/incallui/contactgrid/BottomRow.java
@@ -124,7 +124,7 @@
     if (primaryInfo.location != null) {
       return primaryInfo.location;
     }
-    if (!TextUtils.isEmpty(primaryInfo.number)) {
+    if (!primaryInfo.nameIsNumber && !TextUtils.isEmpty(primaryInfo.number)) {
       CharSequence spannedNumber = spanDisplayNumber(primaryInfo.number);
       if (primaryInfo.label == null) {
         return spannedNumber;