drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0e412304: Catch exceptions in SipPhone.canTake().

Browse Source 
Merge commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44' into gingerbread-plus-aosp

* commit '0e412304813ccd3a3fb6a643836e4f0922d1dc44':
  Catch exceptions in SipPhone.canTake().
This commit is contained in:
Hung-ying Tyan
2010-09-30 10:09:39 -07:00
committed by Android Git Automerger
parent 2c4573263a 0e41230481
commit 49c13e512c
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,14 +126,27 @@ public class SipPhone extends SipPhoneBase {
return false;
}
SipAudioCall sipAudioCall = (SipAudioCall) incomingCall;
Log.v(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);
return true;
try {
SipAudioCall sipAudioCall = (SipAudioCall) incomingCall;
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;
}
@ -358,6 +371,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();