Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3011b661 authored by Hung-ying Tyan's avatar Hung-ying Tyan Committed by Android Git Automerger
Browse files

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

Merge commit 'd6d83279'

* commit 'd6d83279':
  SIP: longer timeout for making call, shorter for cancelling
parents a7936a5d d6d83279

services/java/com/android/server/sip/SipSessionGroup.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+7 −5
Original line number Diff line number Diff line
@@ -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);

            }