diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-05-16 00:09:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-16 00:09:31 +0000 |
| commit | c57430a61eab62e88372f386c75989dab6332608 (patch) | |
| tree | b606f1899f80fcd0ea3ee753ce799883d5a673ab /java/com/android/incallui/CallCardPresenter.java | |
| parent | 9842b4a7fd1d852b1353af806da4913b4298d516 (diff) | |
| parent | 0c9dbf507b53a12bdf577ff3e55c1686a2e089de (diff) | |
Merge "Update Dialer to v10 RC32" into oc-dev
am: 0c9dbf507b
Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 76a5d24a8..0b3592d01 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -373,6 +373,9 @@ public class CallCardPresenter @Override public void onHandoverToWifiFailure() {} + @Override + public void onInternationalCallOnWifi() {} + /** Handles a change to the child number by refreshing the primary call info. */ @Override public void onDialerCallChildNumberChange() { @@ -737,7 +740,7 @@ public class CallCardPresenter mInCallScreen.setPrimary( new PrimaryInfo( number, - name, + mPrimary.updateNameIfRestricted(name), nameIsNumber, shouldShowLocationAsLabel(nameIsNumber, mPrimaryContactInfo.shouldShowLocation) ? mPrimaryContactInfo.location @@ -890,7 +893,7 @@ public class CallCardPresenter mInCallScreen.setSecondary( new SecondaryInfo( true /* show */, - name, + mSecondary.updateNameIfRestricted(name), nameIsNumber, mSecondaryContactInfo.label, mSecondary.getCallProviderLabel(), |