Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling

Browse Source 
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
  SIP: longer timeout for making call, shorter for cancelling
This commit is contained in:
Hung-ying Tyan
2010-09-24 15:58:09 -07:00
committed by Android Git Automerger
parent a7936a5d6d d6d8327918
commit 3011b66172
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/sip/SipSessionGroup.java
View File

@@ -84,7 +84,7 @@ class SipSessionGroup implements SipListener {
private static final String ANONYMOUS = "anonymous";
private static final String SERVER_ERROR_PREFIX = "Response: ";
private static final int EXPIRY_TIME = 3600; // in seconds
private static final int CANCEL_CALL_TIMER = 5; // in seconds
private static final int CANCEL_CALL_TIMER = 3; // in seconds
private static final EventObject DEREGISTER = new EventObject("Deregister");
private static final EventObject END_CALL = new EventObject("End call");

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

@@ -73,7 +73,9 @@ import java.util.List;
public class SipPhone extends SipPhoneBase {
private static final String LOG_TAG = "SipPhone";
private static final boolean LOCAL_DEBUG = true;
private static final int SESSION_TIMEOUT = 8; // in seconds
private static final int TIMEOUT_MAKE_CALL = 15; // in seconds
private static final int TIMEOUT_ANSWER_CALL = 8; // in seconds
private static final int TIMEOUT_HOLD_CALL = 15; // in seconds
// A call that is ringing or (call) waiting
private SipCall ringingCall = new SipCall();
@@ -693,7 +695,7 @@ public class SipPhone extends SipPhoneBase {
void acceptCall() throws CallStateException {
try {
mSipAudioCall.answerCall(SESSION_TIMEOUT);
mSipAudioCall.answerCall(TIMEOUT_ANSWER_CALL);
} catch (SipException e) {
throw new CallStateException("acceptCall(): " + e);
}
@@ -711,7 +713,7 @@ public class SipPhone extends SipPhoneBase {
void dial() throws SipException {
setState(Call.State.DIALING);
mSipAudioCall = mSipManager.makeAudioCall(mProfile, mPeer, null,
SESSION_TIMEOUT);
TIMEOUT_MAKE_CALL);
mSipAudioCall.setRingbackToneEnabled(false);
mSipAudioCall.setListener(mAdapter);
}
@@ -719,7 +721,7 @@ public class SipPhone extends SipPhoneBase {
void hold() throws CallStateException {
setState(Call.State.HOLDING);
try {
mSipAudioCall.holdCall(SESSION_TIMEOUT);
mSipAudioCall.holdCall(TIMEOUT_HOLD_CALL);
} catch (SipException e) {
throw new CallStateException("hold(): " + e);
}
@@ -729,7 +731,7 @@ public class SipPhone extends SipPhoneBase {
mSipAudioCall.setAudioGroup(audioGroup);
setState(Call.State.ACTIVE);
try {
mSipAudioCall.continueCall(SESSION_TIMEOUT);
mSipAudioCall.continueCall(TIMEOUT_HOLD_CALL);
} catch (SipException e) {
throw new CallStateException("unhold(): " + e);
}