Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread (32346522) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+21 −14

Original line number	Diff line number	Diff line
		@@ -441,7 +441,8 @@ public class SipPhone extends SipPhoneBase {
		@Override
		public void hangup() throws CallStateException {
		synchronized (SipPhone.class) {
		Log.v(LOG_TAG, "hang up call: " + getState() + ": " + this
		if (mState.isAlive()) {
		Log.d(LOG_TAG, "hang up call: " + getState() + ": " + this
		+ " on phone " + getPhone());
		CallStateException excp = null;
		for (Connection c : connections) {
		@@ -453,6 +454,10 @@ public class SipPhone extends SipPhoneBase {
		}
		if (excp != null) throw excp;
		setState(State.DISCONNECTING);
		} else {
		Log.d(LOG_TAG, "hang up dead call: " + getState() + ": "
		+ this + " on phone " + getPhone());
		}
		}
		}

		@@ -784,11 +789,13 @@ public class SipPhone extends SipPhoneBase {
		public void hangup() throws CallStateException {
		synchronized (SipPhone.class) {
		Log.v(LOG_TAG, "hangup conn: " + mPeer.getUriString() + ": "
		+ ": on phone " + getPhone().getPhoneName());
		+ mState + ": on phone " + getPhone().getPhoneName());
		try {
		if (mState.isAlive()) {
		if (mSipAudioCall != null) mSipAudioCall.endCall();
		setState(Call.State.DISCONNECTING);
		setDisconnectCause(DisconnectCause.LOCAL);
		}
		} catch (SipException e) {
		throw new CallStateException("hangup(): " + e);
		}