Merge commit '63a6a12c' into fix-merge-conflict (a6aedcd5) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/GsmConnection.java

+13 −19

Original line number	Diff line number	Diff line
		@@ -90,7 +90,6 @@ public class GsmConnection extends Connection {
		static final int EVENT_WAKE_LOCK_TIMEOUT = 4;

		//***** Constants
		static final int PAUSE_DELAY_FIRST_MILLIS = 100;
		static final int PAUSE_DELAY_MILLIS = 3 * 1000;
		static final int WAKE_LOCK_TIMEOUT_MILLIS = 60*1000;

		@@ -560,24 +559,19 @@ public class GsmConnection extends Connection {
		mOwner.mCi.sendDtmf(c, mHandler.obtainMessage(EVENT_DTMF_DONE));
		} else if (c == PhoneNumberUtils.PAUSE) {
		// From TS 22.101:

		// "The first occurrence of the "DTMF Control Digits Separator"
		// shall be used by the ME to distinguish between the addressing
		// digits (i.e. the phone number) and the DTMF digits...."

		if (mNextPostDialChar == 1) {
		// The first occurrence.
		// We don't need to pause here, but wait for just a bit anyway
		mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_PAUSE_DONE),
		PAUSE_DELAY_FIRST_MILLIS);
		} else {
		// It continues...
		// "Upon subsequent occurrences of the separator, the UE shall
		// pause again for 3 seconds (\u00B1 20 %) before sending any
		// further DTMF digits."
		// Upon the called party answering the UE shall send the DTMF digits
		// automatically to the network after a delay of 3 seconds( 20 ).
		// The digits shall be sent according to the procedures and timing
		// specified in 3GPP TS 24.008 [13]. The first occurrence of the
		// "DTMF Control Digits Separator" shall be used by the ME to
		// distinguish between the addressing digits (i.e. the phone number)
		// and the DTMF digits. Upon subsequent occurrences of the
		// separator,
		// the UE shall pause again for 3 seconds ( 20 ) before sending
		// any further DTMF digits.
		mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_PAUSE_DONE),
		PAUSE_DELAY_MILLIS);
		}
		} else if (c == PhoneNumberUtils.WAIT) {
		setPostDialState(PostDialState.WAIT);
		} else if (c == PhoneNumberUtils.WILD) {