summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2010-09-28 09:29:15 +0800
committerChung-yih Wang <cywang@google.com>2010-09-28 12:46:04 +0800
commit245475925eff61ee76bde58de69253a889e39d0a (patch)
tree0f1809bc5d46bc731c78f5c8e2f02e1edfb4e69d /telephony/java
parent368d796e2e28ecd738362c7a4566cb3eb219ab26 (diff)
downloadframeworks_base-245475925eff61ee76bde58de69253a889e39d0a.zip
frameworks_base-245475925eff61ee76bde58de69253a889e39d0a.tar.gz
frameworks_base-245475925eff61ee76bde58de69253a889e39d0a.tar.bz2
Fix the startAudio order for 3-way calls.
Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
Diffstat (limited to 'telephony/java')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java4
1 files 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 3f4fdda..5e7d9ac 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