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

Commit 5b93050d authored Jul 12, 2009 by Android (Google) Code Review Committed by The Android Open Source Project Jul 12, 2009

am f6c96839: Merge change 6850 into donut

Merge commit 'f6c96839'

* commit 'f6c96839':
  Extra parameters for sendBurstDtmf.

parents 9afcd84f f6c96839

telephony/java/com/android/internal/telephony/CommandsInterface.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -862,7 +862,7 @@ public interface CommandsInterface {
		* ar.userObject contains the orignal value of result.obj
		* ar.result is null on success and failure
		*/
		void sendBurstDtmf(String dtmfString, Message result);
		void sendBurstDtmf(String dtmfString, int on, int off, Message result);

		/**
		* smscPDU is smsc address in PDU form GSM BCD format prefixed

telephony/java/com/android/internal/telephony/Phone.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -760,10 +760,12 @@ public interface Phone {
		* back to caller.
		*
		* @param dtmfString is string representing the dialing digit(s) in the active call
		* @param on the DTMF ON length in milliseconds, or 0 for default
		* @param off the DTMF OFF length in milliseconds, or 0 for default
		* @param onCompelte is the callback message when the action is processed by BP
		*
		*/
		void sendBurstDtmf(String dtmfString, Message onComplete);
		void sendBurstDtmf(String dtmfString, int on, int off, Message onComplete);

		/**
		* Sets the radio power on/off state (off is sometimes

telephony/java/com/android/internal/telephony/PhoneBase.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -705,7 +705,7 @@ public abstract class PhoneBase implements Phone {
		return null;
		}

		public void sendBurstDtmf(String dtmfString, Message onComplete) {
		public void sendBurstDtmf(String dtmfString, int on, int off, Message onComplete) {
		// This function should be overridden by the class CDMAPhone. Not implemented in GSMPhone.
		Log.e(LOG_TAG, "Error! This function should never be executed, inactive CDMAPhone.");
		}

telephony/java/com/android/internal/telephony/PhoneProxy.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -713,8 +713,8 @@ public class PhoneProxy extends Handler implements Phone {
		return mActivePhone.getCdmaEriIconMode();
		}

		public void sendBurstDtmf(String dtmfString, Message onComplete){
		mActivePhone.sendBurstDtmf(dtmfString,onComplete);
		public void sendBurstDtmf(String dtmfString, int on, int off, Message onComplete){
		mActivePhone.sendBurstDtmf(dtmfString, on, off, onComplete);
		}

		public void exitEmergencyCallbackMode(){

telephony/java/com/android/internal/telephony/RIL.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -1068,10 +1068,13 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		}

		public void
		sendBurstDtmf(String dtmfString, Message result) {
		sendBurstDtmf(String dtmfString, int on, int off, Message result) {
		RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_BURST_DTMF, result);

		rr.mp.writeInt(3);
		rr.mp.writeString(dtmfString);
		rr.mp.writeString(Integer.toString(on));
		rr.mp.writeString(Integer.toString(off));

		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " : " + dtmfString);