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

am 5cab38ba: Merge "SIP: minor fixes." into gingerbread

Browse Source 
Merge commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp

* commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb':
  SIP: minor fixes.
This commit is contained in:
Hung-ying Tyan
2010-10-03 22:45:49 -07:00
committed by Android Git Automerger
parent 3d019a374f 5cab38ba11
commit 1f34ffd7e3
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
voip/java/android/net/sip/SipManager.java
View File

@ -23,6 +23,7 @@ import android.os.IBinder;
import android.os.Looper;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import java.text.ParseException;
@ -83,6 +84,8 @@ public class SipManager {
/** Part of the incoming call intent. */
public static final String EXTRA_OFFER_SD = "android:sipOfferSD";
private static final String TAG = "SipManager";
private ISipService mSipService;
private Context mContext;
@ -525,8 +528,10 @@ public class SipManager {
return ((session == null)
? mUri
: session.getLocalProfile().getUriString());
} catch (RemoteException e) {
throw new RuntimeException(e);
} catch (Throwable e) {
// SipService died? SIP stack died?
Log.w(TAG, "getUri(): " + e);
return null;
}
}

27
voip/java/com/android/server/sip/SipSessionGroup.java
View File

@ -49,6 +49,7 @@ import javax.sip.DialogTerminatedEvent;
import javax.sip.IOExceptionEvent;
import javax.sip.InvalidArgumentException;
import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.RequestEvent;
import javax.sip.ResponseEvent;
import javax.sip.ServerTransaction;
@ -415,11 +416,25 @@ class SipSessionGroup implements SipListener {
mPeerProfile = null;
mState = SipSession.State.READY_TO_CALL;
mInviteReceived = null;
mDialog = null;
mServerTransaction = null;
mClientTransaction = null;
mPeerSessionDescription = null;
if (mDialog != null) mDialog.delete();
mDialog = null;
try {
if (mServerTransaction != null) mServerTransaction.terminate();
} catch (ObjectInUseException e) {
// ignored
}
mServerTransaction = null;
try {
if (mClientTransaction != null) mClientTransaction.terminate();
} catch (ObjectInUseException e) {
// ignored
}
mClientTransaction = null;
cancelSessionTimer();
}
@ -884,8 +899,8 @@ class SipSessionGroup implements SipListener {
generateTag());
mDialog = mClientTransaction.getDialog();
addSipSession(this);
mProxy.onCalling(this);
startSessionTimer(cmd.getTimeout());
mProxy.onCalling(this);
return true;
} else if (evt instanceof RegisterCommand) {
mState = SipSession.State.REGISTERING;
@ -964,8 +979,8 @@ class SipSessionGroup implements SipListener {
// ring back for better UX
if (mState == SipSession.State.OUTGOING_CALL) {
mState = SipSession.State.OUTGOING_CALL_RING_BACK;
mProxy.onRingingBack(this);
cancelSessionTimer();
mProxy.onRingingBack(this);
}
return true;
case Response.OK:
@ -1222,14 +1237,12 @@ class SipSessionGroup implements SipListener {
}
private void onRegistrationFailed(Throwable exception) {
reset();
exception = getRootCause(exception);
onRegistrationFailed(getErrorCode(exception),
exception.toString());
}
private void onRegistrationFailed(Response response) {
reset();
int statusCode = response.getStatusCode();
onRegistrationFailed(getErrorCode(statusCode),
createErrorMessage(response));