From cb2a981d7f948f24c451a18f47fdbb12177f0ebd Mon Sep 17 00:00:00 2001 From: twyen Date: Fri, 23 Mar 2018 18:21:13 -0700 Subject: Switch setLabel and setLocation Solves copy and paste error where call to setLabel and setLocation has been mixed up. Problem was introduced in: Ifb90019b6a5568788d51f4a55a07f7693c803eaf Bug: 76190741 Test: Verifies that phone number is correct in callscreen when calling contact Cherry picked from https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/648300 Bug: 76190741 Test: N/A PiperOrigin-RevId: 190305044 Change-Id: Ie268f02cabadc939e6a2e1f73ae4e126e314dc57 --- java/com/android/incallui/CallCardPresenter.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 49f819bab..316b6cca0 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -768,12 +768,11 @@ public class CallCardPresenter .setNumber(number) .setName(primary.updateNameIfRestricted(name)) .setNameIsNumber(nameIsNumber) - .setLabel( + .setLocation( shouldShowLocationAsLabel(nameIsNumber, primaryContactInfo.shouldShowLocation) ? primaryContactInfo.location : null) - .setLocation( - isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label) + .setLabel(isChildNumberShown || isCallSubjectShown ? null : primaryContactInfo.label) .setPhoto(primaryContactInfo.photo) .setPhotoType(primaryContactInfo.photoType) .setIsSipCall(primaryContactInfo.isSipCall) -- cgit v1.2.3