diff options
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index a51f54edb..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() { @@ -664,8 +667,16 @@ public class CallCardPresenter MultimediaData multimediaData = null; if (mPrimary.getNumber() != null) { EnrichedCallManager manager = EnrichedCallComponent.get(mContext).getEnrichedCallManager(); + + EnrichedCallManager.Filter filter; + if (mPrimary.isIncoming()) { + filter = manager.createIncomingCallComposerFilter(); + } else { + filter = manager.createOutgoingCallComposerFilter(); + } + Session enrichedCallSession = - manager.getSession(mPrimary.getUniqueCallId(), mPrimary.getNumber()); + manager.getSession(mPrimary.getUniqueCallId(), mPrimary.getNumber(), filter); mPrimary.setEnrichedCallSession(enrichedCallSession); mPrimary.setEnrichedCallCapabilities(manager.getCapabilities(mPrimary.getNumber())); @@ -729,7 +740,7 @@ public class CallCardPresenter mInCallScreen.setPrimary( new PrimaryInfo( number, - name, + mPrimary.updateNameIfRestricted(name), nameIsNumber, shouldShowLocationAsLabel(nameIsNumber, mPrimaryContactInfo.shouldShowLocation) ? mPrimaryContactInfo.location @@ -882,7 +893,7 @@ public class CallCardPresenter mInCallScreen.setSecondary( new SecondaryInfo( true /* show */, - name, + mSecondary.updateNameIfRestricted(name), nameIsNumber, mSecondaryContactInfo.label, mSecondary.getCallProviderLabel(), |