commit ae6c8ec0d86d2c4756ab876b8ee44249713c86fb
author wangqi <wangqi@google.com> Thu Sep 28 17:39:40 2017 -0700
committer Eric Erfanian <erfanian@google.com> Mon Oct 02 16:13:15 2017 -0700
tree 938cfe131acc6185349562b329af09f262474a30
parent cb097482c41778c446f66690c10ce06f17463358

Fix bug that phone number is shown for local contacts.

This is a regression caused by cl/169961072.
This change will make sure phone number is only shown on top row for non-local contacts if the name is not number and the call is active.

Bug: 67047386
Test: TopRowTest
PiperOrigin-RevId: 170424277
Change-Id: I9b3ab9432a938b2fb1c6632f2d9404bee413588f

java/com/android/incallui/CallCardPresenter.java

diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java
index be9b3ef..d49d556 100644
--- a/java/com/android/incallui/CallCardPresenter.java
+++ b/java/com/android/incallui/CallCardPresenter.java
@@ -712,6 +712,7 @@
               showContactPhoto,
               hasWorkCallProperty,
               false /* isSpam */,
+              false /* isLocalContact */,
               false /* answeringDisconnectsOngoingCall */,
               shouldShowLocation(),
               null /* contactInfoLookupKey */,
@@ -760,6 +761,7 @@
               showContactPhoto,
               hasWorkCallProperty || isWorkContact,
               mPrimary.isSpam(),
+              mPrimaryContactInfo.isLocalContact(),
               mPrimary.answeringDisconnectsForegroundVideoCall(),
               shouldShowLocation(),
               mPrimaryContactInfo.lookupKey,