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

Merge "SipAudioCall: remove SipManager dependency." into gingerbread

Browse Source
This commit is contained in:
Hung-ying Tyan
2010-09-27 10:54:27 -07:00
committed by Android (Google) Code Review
parent 025a39af34 3a4197e642
commit fd144d7667
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
voip/java/android/net/sip/SipAudioCall.java
View File

@ -46,7 +46,7 @@ import java.util.Map;
* Class that handles an audio call over SIP. * Class that handles an audio call over SIP.
*/ */
/** @hide */ /** @hide */
public class SipAudioCall extends SipSessionAdapter { public class SipAudioCall {
private static final String TAG = SipAudioCall.class.getSimpleName(); private static final String TAG = SipAudioCall.class.getSimpleName();
private static final boolean RELEASE_SOCKET = true; private static final boolean RELEASE_SOCKET = true;
private static final boolean DONT_RELEASE_SOCKET = false; private static final boolean DONT_RELEASE_SOCKET = false;
@ -530,7 +530,7 @@ public class SipAudioCall extends SipSessionAdapter {
* will be called. * will be called.
* *
* @param callee the SIP profile to make the call to * @param callee the SIP profile to make the call to
* @param sipManager the {@link SipManager} object to help make call with * @param sipSession the {@link SipSession} for carrying out the call
* @param timeout the timeout value in seconds. Default value (defined by * @param timeout the timeout value in seconds. Default value (defined by
* SIP protocol) is used if {@code timeout} is zero or negative. * SIP protocol) is used if {@code timeout} is zero or negative.
* @see Listener.onError * @see Listener.onError
@ -538,16 +538,12 @@ public class SipAudioCall extends SipSessionAdapter {
* call * call
*/ */
public synchronized void makeCall(SipProfile peerProfile, public synchronized void makeCall(SipProfile peerProfile,
SipManager sipManager, int timeout) throws SipException { SipSession sipSession, int timeout) throws SipException {
SipSession s = mSipSession = sipManager.createSipSession( mSipSession = sipSession;
mLocalProfile, createListener());
if (s == null) {
throw new SipException(
"Failed to create SipSession; network available?");
}
try { try {
mAudioStream = new AudioStream(InetAddress.getByName(getLocalIp())); mAudioStream = new AudioStream(InetAddress.getByName(getLocalIp()));
s.makeCall(peerProfile, createOffer().encode(), timeout); sipSession.setListener(createListener());
sipSession.makeCall(peerProfile, createOffer().encode(), timeout);
} catch (IOException e) { } catch (IOException e) {
throw new SipException("makeCall()", e); throw new SipException("makeCall()", e);
} }

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

@ -269,7 +269,12 @@ public class SipManager {
throws SipException { throws SipException {
SipAudioCall call = new SipAudioCall(mContext, localProfile); SipAudioCall call = new SipAudioCall(mContext, localProfile);
call.setListener(listener); call.setListener(listener);
call.makeCall(peerProfile, this, timeout); SipSession s = createSipSession(localProfile, null);
if (s == null) {
throw new SipException(
"Failed to create SipSession; network available?");
}
call.makeCall(peerProfile, s, timeout);
return call; return call;
} }