summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Wu <jimmyw@nvidia.com>2017-05-29 23:37:18 +0800
committerJimmy Wu <jimmyw@nvidia.com>2017-06-07 15:33:00 +0800
commit4c919d19dcc503ea8751b09c1110682455114074 (patch)
treec953c3f52d9b26e722d5b7d5a0051c3347942c59
parenta6f3cc3e21183d567decdb34e2ab1939d34ed7e2 (diff)
downloadandroid_packages_services_Telecomm-4c919d19dcc503ea8751b09c1110682455114074.tar.gz
android_packages_services_Telecomm-4c919d19dcc503ea8751b09c1110682455114074.tar.bz2
android_packages_services_Telecomm-4c919d19dcc503ea8751b09c1110682455114074.zip
Fix audio state issue for MT IMS call
The IMS audio routing may be via modem or via RTP stream. In case via RTP stream, the CallAudioModeStateMachine should transit to mVoipCallFocusState. Test: Manual Change-Id: Ida6a69b95fad45dfa388e034215556daba623ff2
-rw-r--r--src/com/android/server/telecom/CallAudioModeStateMachine.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java
index 3d778f2a..d8d1b895 100644
--- a/src/com/android/server/telecom/CallAudioModeStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java
@@ -276,9 +276,10 @@ public class CallAudioModeStateMachine extends StateMachine {
// This happens when an IMS call is answered by the in-call UI. Special case
// that we have to deal with for some reason.
- // VOIP calls should never invoke this mechanism, so transition directly to
- // the sim call focus state.
- transitionTo(mSimCallFocusState);
+ // The IMS audio routing may be via modem or via RTP stream. In case via RTP
+ // stream, the state machine should transit to mVoipCallFocusState.
+ transitionTo(args.foregroundCallIsVoip
+ ? mVoipCallFocusState : mSimCallFocusState);
return HANDLED;
default:
// The forced focus switch commands are handled by BaseState.