diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-09-27 22:58:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 22:58:59 -0700 |
| commit | 4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989 (patch) | |
| tree | 3411740581ecba7a0f29acf3beb8be2ae476053f /telephony | |
| parent | 159cceaae22076b743626ddde84c501b3f491f6e (diff) | |
| parent | 245475925eff61ee76bde58de69253a889e39d0a (diff) | |
| download | frameworks_base-4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989.zip frameworks_base-4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989.tar.gz frameworks_base-4a64afd2889cb6b6b2c94d3d7b24ebd3a2f10989.tar.bz2 | |
am 24547592: Fix the startAudio order for 3-way calls.
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp
* commit '245475925eff61ee76bde58de69253a889e39d0a':
Fix the startAudio order for 3-way calls.
Diffstat (limited to 'telephony')
| -rwxr-xr-x | telephony/java/com/android/internal/telephony/sip/SipPhone.java | 4 |
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 |