From 245475925eff61ee76bde58de69253a889e39d0a Mon Sep 17 00:00:00 2001
From: Chung-yih Wang <cywang@google.com>
Date: Tue, 28 Sep 2010 09:29:15 +0800
Subject: [PATCH] Fix the startAudio order for 3-way calls.

Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
---
 .../java/com/android/internal/telephony/sip/SipPhone.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 3f4fdda46910d..5e7d9ac1784b4 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -642,14 +642,14 @@ public class SipPhone extends SipPhoneBase {
 
             @Override
             public void onCallEstablished(SipAudioCall call) {
-                call.startAudio();
                 onChanged(call);
+                if (mState == Call.State.ACTIVE) call.startAudio();
             }
 
             @Override
             public void onCallHeld(SipAudioCall call) {
-                call.startAudio();
                 onChanged(call);
+                if (mState == Call.State.HOLDING) call.startAudio();
             }
 
             @Override