Merge "IMS: start and stop dtmf tones" (0729b239) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -564,18 +564,18 @@ public class ImsPhone extends ImsPhoneBase {
		@Override
		public void
		startDtmf(char c) {
		if (!PhoneNumberUtils.is12Key(c)) {
		if (!(PhoneNumberUtils.is12Key(c) \|\| (c >= 'A' && c <= 'D'))) {
		Rlog.e(LOG_TAG,
		"startDtmf called with invalid character '" + c + "'");
		} else {
		sendDtmf(c);
		mCT.startDtmf(c);
		}
		}

		@Override
		public void
		stopDtmf() {
		// no op
		mCT.stopDtmf();
		}

		@Override

+24 −0

Original line number	Diff line number	Diff line
		@@ -759,6 +759,30 @@ public final class ImsPhoneCallTracker extends CallTracker {
		}
		}

		/package/ void
		startDtmf(char c) {
		if (DBG) log("startDtmf");

		ImsCall imscall = mForegroundCall.getImsCall();
		if (imscall != null) {
		imscall.startDtmf(c);
		} else {
		loge("startDtmf : no foreground call");
		}
		}

		/package/ void
		stopDtmf() {
		if (DBG) log("stopDtmf");

		ImsCall imscall = mForegroundCall.getImsCall();
		if (imscall != null) {
		imscall.stopDtmf();
		} else {
		loge("stopDtmf : no foreground call");
		}
		}

		//***** Called from ImsPhoneConnection

		/package/ void