Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread

Browse Source 
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
This commit is contained in:
Hung-ying Tyan
2010-09-27 19:26:11 -07:00
committed by Android Git Automerger
parent 8c66580759 3234652242
commit 1738252a59
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
telephony/java/com/android/internal/telephony/sip/SipPhone.java
View File

@@ -441,18 +441,23 @@ public class SipPhone extends SipPhoneBase {
@Override @Override
public void hangup() throws CallStateException { public void hangup() throws CallStateException {
synchronized (SipPhone.class) { synchronized (SipPhone.class) {
Log.v(LOG_TAG, "hang up call: " + getState() + ": " + this if (mState.isAlive()) {
+ " on phone " + getPhone()); Log.d(LOG_TAG, "hang up call: " + getState() + ": " + this
CallStateException excp = null; + " on phone " + getPhone());
for (Connection c : connections) { CallStateException excp = null;
try { for (Connection c : connections) {
c.hangup(); try {
} catch (CallStateException e) { c.hangup();
excp = e; } catch (CallStateException e) {
excp = e;
}
} }
if (excp != null) throw excp;
setState(State.DISCONNECTING);
} else {
Log.d(LOG_TAG, "hang up dead call: " + getState() + ": "
+ this + " on phone " + getPhone());
} }
if (excp != null) throw excp;
setState(State.DISCONNECTING);
} }
} }
@@ -784,11 +789,13 @@ public class SipPhone extends SipPhoneBase {
public void hangup() throws CallStateException { public void hangup() throws CallStateException {
synchronized (SipPhone.class) { synchronized (SipPhone.class) {
Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": " Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": "
+ ": on phone " + getPhone().getPhoneName()); + mState + ": on phone " + getPhone().getPhoneName());
try { try {
if (mSipAudioCall != null) mSipAudioCall.endCall(); if (mState.isAlive()) {
setState(Call.State.DISCONNECTING); if (mSipAudioCall != null) mSipAudioCall.endCall();
setDisconnectCause(DisconnectCause.LOCAL); setState(Call.State.DISCONNECTING);
setDisconnectCause(DisconnectCause.LOCAL);
}
} catch (SipException e) { } catch (SipException e) {
throw new CallStateException("hangup(): " + e); throw new CallStateException("hangup(): " + e);
} }