am 49c13e51: am 0e412304: Catch exceptions in SipPhone.canTake(). (db9e87b9) · Commits · e / os / android_frameworks_base

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

+26 −8

Original line number	Diff line number	Diff line
		@@ -133,15 +133,28 @@ public class SipPhone extends SipPhoneBase {
		return false;
		}

		try {
		SipAudioCall sipAudioCall = (SipAudioCall) incomingCall;
		Log.v(LOG_TAG, " ++++++ taking call from: "
		Log.d(LOG_TAG, "+++ taking call from: "
		+ sipAudioCall.getPeerProfile().getUriString());
		String localUri = sipAudioCall.getLocalProfile().getUriString();
		if (localUri.equals(mProfile.getUriString())) {
		boolean makeCallWait = foregroundCall.getState().isAlive();
		ringingCall.initIncomingCall(sipAudioCall, makeCallWait);
		if (sipAudioCall.getState()
		!= SipSession.State.INCOMING_CALL) {
		// Peer cancelled the call!
		Log.d(LOG_TAG, " call cancelled !!");
		ringingCall.reset();
		}
		return true;
		}
		} catch (Exception e) {
		// Peer may cancel the call at any time during the time we hook
		// up ringingCall with sipAudioCall. Clean up ringingCall when
		// that happens.
		ringingCall.reset();
		}
		return false;
		}
		}
		@@ -361,6 +374,11 @@ public class SipPhone extends SipPhoneBase {
		}

		private class SipCall extends SipCallBase {
		void reset() {
		connections.clear();
		setState(Call.State.IDLE);
		}

		void switchWith(SipCall that) {
		synchronized (SipPhone.class) {
		SipCall tmp = new SipCall();