commit 177712858d5897db18e2adf689c8e75f81f05c87
author Matthew Xie <mattx@google.com> Wed Oct 15 18:28:55 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 15 18:28:55 2014 +0000
tree ce7d9e1cc6bda0f964e0668baf822f9c81bc673b
parent 7efa9db2129c99475684a2e44c4fb89cce3134bc
parent 10260dc85133bbfbc51c53f06ba8992e00d9b67a

Merge "ignore telephony call state if telephony mgr state is idle"

src/com/android/bluetooth/hfp/HeadsetStateMachine.java

diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 95dc22c..1619b62 100755
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -1517,14 +1517,28 @@
         log("mNumActive: " + callState.mNumActive + " mNumHeld: " +
             callState.mNumHeld +" mCallState: " + callState.mCallState);
         log("mNumber: " + callState.mNumber + " mType: " + callState.mType);
-        if(!isVirtualCall) {
-            /* Not a Virtual call request. End the virtual call, if running,
-            before sending phoneStateChangeNative to BTIF */
-            terminateScoUsingVirtualVoiceCall();
-        }
-        if (getCurrentState() != mDisconnected) {
-            phoneStateChangeNative(callState.mNumActive, callState.mNumHeld,
-                callState.mCallState, callState.mNumber, callState.mType);
+
+        if (isVirtualCall) {
+            // virtual call state update
+            if (getCurrentState() != mDisconnected) {
+                phoneStateChangeNative(callState.mNumActive, callState.mNumHeld,
+                    callState.mCallState, callState.mNumber, callState.mType);
+            }
+        } else {
+            // circuit-switch voice call update
+            // stop virtual voice call if there is a CSV call ongoing
+            if (callState.mNumActive > 0 || callState.mNumHeld > 0
+                    || callState.mCallState != HeadsetHalConstants.CALL_STATE_IDLE) {
+                terminateScoUsingVirtualVoiceCall();
+            }
+            // at this step: if there is virtual call ongoing, it means there is no CSV call
+            // let virtual call continue and skip phone state update
+            if (!isVirtualCallInProgress()) {
+                if (getCurrentState() != mDisconnected) {
+                    phoneStateChangeNative(callState.mNumActive, callState.mNumHeld,
+                        callState.mCallState, callState.mNumber, callState.mType);
+                }
+            }
         }
     }