summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-24 03:01:25 +0800
committerHung-ying Tyan <tyanh@google.com>2010-09-25 06:09:00 +0800
commit194bbcce9ba15634500f542b9ea017b2cf154b45 (patch)
treed91fc2516d703c6d2b41178ae7e12d143128b0ac /telephony
parent52f58e96a723a56e6619c237c814a07503745de9 (diff)
downloadframeworks_base-194bbcce9ba15634500f542b9ea017b2cf154b45.zip
frameworks_base-194bbcce9ba15634500f542b9ea017b2cf154b45.tar.gz
frameworks_base-194bbcce9ba15634500f542b9ea017b2cf154b45.tar.bz2
SIP: longer timeout for making call, shorter for cancelling
http://b/3021865 Change-Id: I354ebcc00f1ac68e4b7b466745c36aeb314f9138
Diffstat (limited to 'telephony')
-rwxr-xr-xtelephony/java/com/android/internal/telephony/sip/SipPhone.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhone.java b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
index 372acc2..45e6ccd 100755
--- a/telephony/java/com/android/internal/telephony/sip/SipPhone.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipPhone.java
@@ -74,7 +74,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();
@@ -690,7 +692,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);
}
@@ -708,7 +710,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);
}
@@ -716,7 +718,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);
}
@@ -726,7 +728,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);
}