commit a81f4d7814acb75b99f871b0348bdef67e0f1c46
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 20 09:31:05 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 20 09:31:05 2017 +0000
tree 055f5c1b603e40da693004c9f311b727d09c395a
parent 4fc672a3e101006050f60a317883fbcb1aaa33de
parent 40b252da6bf60cd7c8f9c1eb045f14625ef56698

Merge "Import translations. DO NOT MERGE"

src/com/android/server/telecom/CallAudioModeStateMachine.java

diff --git a/src/com/android/server/telecom/CallAudioModeStateMachine.java b/src/com/android/server/telecom/CallAudioModeStateMachine.java
index df912ed..b5c7e7a 100644
--- a/src/com/android/server/telecom/CallAudioModeStateMachine.java
+++ b/src/com/android/server/telecom/CallAudioModeStateMachine.java
@@ -270,9 +270,10 @@
                     // 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.