diff options
| author | twyen <twyen@google.com> | 2018-03-23 18:21:13 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-piper@google.com> | 2018-03-26 22:21:49 -0700 |
| commit | cb2a981d7f948f24c451a18f47fdbb12177f0ebd (patch) | |
| tree | 8b8973ad9e7972025d687687307ea14c63b4321f | |
| parent | efc3de47fd8394fd7f929f12bf7cbe0feb3a74cc (diff) | |
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
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 5 |
1 files 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) |