commit 3eb2a4ae98eb737004d40f7ce03a8d83883fb079
author Kuanting Zhu <frank.zhu@motorola.com> Fri Oct 23 22:32:24 2009 -0500
committer Jaikumar Ganesh <jaikumar@google.com> Wed Nov 04 15:47:41 2009 -0800
tree 94cbab1e3fa50ff9c67bc93ccba4dfaacfc074a8
parent a9aed8ac9b2b35993ba638751faf5344a71a2725

Fix the CDMA issue that incorrectly send the conference status in CLCC response

Multiparty flag should not be set when calls are not really in conference.
To use CdmaPhoneCallState.PhoneCallState.CONF_CALL instead of SINGLE_ACTIVE

Bug: 2238628
Dr No: Eastham

src/com/android/phone/BluetoothHandsfree.java

diff --git a/src/com/android/phone/BluetoothHandsfree.java b/src/com/android/phone/BluetoothHandsfree.java
index 078766d..6b98c80 100644
--- a/src/com/android/phone/BluetoothHandsfree.java
+++ b/src/com/android/phone/BluetoothHandsfree.java
@@ -1402,10 +1402,10 @@
         }
 
         int mpty = 0;
-        if (currCdmaCallState == CdmaPhoneCallState.PhoneCallState.SINGLE_ACTIVE) {
-            mpty = 0;
-        } else {
+        if (currCdmaCallState == CdmaPhoneCallState.PhoneCallState.CONF_CALL) {
             mpty = 1;
+        } else {
+            mpty = 0;
         }
 
         int direction = c.isIncoming() ? 1 : 0;