From efc3de47fd8394fd7f929f12bf7cbe0feb3a74cc Mon Sep 17 00:00:00 2001 From: twyen Date: Fri, 23 Mar 2018 17:39:25 -0700 Subject: Forward extras from pre call external receivers to placeCall(). All extras that CallIntentBuilder handles will be stripped and read into the builder. Other entries will be send to telecom when the intent is build. Renamed CallIntentBuilder.outGoingCallExtras for clarity. Bug: 72877810 Test: Unit tests PiperOrigin-RevId: 190301333 Change-Id: I9a8bf6664b270078d91dbfb3398f8990d243b9f8 --- java/com/android/dialer/precall/impl/AssistedDialAction.java | 6 ++++-- java/com/android/dialer/precall/impl/CallingAccountSelector.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'java/com/android/dialer/precall/impl') diff --git a/java/com/android/dialer/precall/impl/AssistedDialAction.java b/java/com/android/dialer/precall/impl/AssistedDialAction.java index 9ed37ac8c..e4e525559 100644 --- a/java/com/android/dialer/precall/impl/AssistedDialAction.java +++ b/java/com/android/dialer/precall/impl/AssistedDialAction.java @@ -69,10 +69,12 @@ public class AssistedDialAction implements PreCallAction { Optional transformedNumber = assistedDialingMediator.attemptAssistedDial(phoneNumber); if (transformedNumber.isPresent()) { - builder.getOutgoingCallExtras().putBoolean(TelephonyManagerCompat.USE_ASSISTED_DIALING, true); + builder + .getInCallUiIntentExtras() + .putBoolean(TelephonyManagerCompat.USE_ASSISTED_DIALING, true); Bundle assistedDialingExtras = transformedNumber.get().toBundle(); builder - .getOutgoingCallExtras() + .getInCallUiIntentExtras() .putBundle(TelephonyManagerCompat.ASSISTED_DIALING_EXTRAS, assistedDialingExtras); builder.setUri( CallUtil.getCallUri(Assert.isNotNull(transformedNumber.get().transformedNumber()))); diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java index a5dc6a097..56b392b19 100644 --- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java +++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java @@ -160,7 +160,7 @@ public class CallingAccountSelector implements PreCallAction { "CallingAccountSelector.processPreferredAccount", "Auto selected suggestion"); builder.setPhoneAccountHandle(result.getSuggestion().get().phoneAccountHandle); builder - .getOutgoingCallExtras() + .getInCallUiIntentExtras() .putString( SuggestionProvider.EXTRA_SIM_SUGGESTION_REASON, result.getSuggestion().get().reason.name()); -- cgit v1.2.3