Merge changes Id438132b,I9d0c6c45 into nyc-dev (f3a8202e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaConnection.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -855,7 +855,7 @@ public class GsmCdmaConnection extends Connection {
		notifyPostDialListenersNextChar(c);

		// TODO: remove the following code since the handler no longer executes anything.
		postDialHandler = mOwner.getPhone().mPostDialHandler;
		postDialHandler = mOwner.getPhone().getPostDialHandler();

		Message notifyMessage;

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -158,8 +158,6 @@ public class GsmCdmaPhone extends Phone {

		private int mPrecisePhoneType;

		public Registrant mPostDialHandler;

		// mEcmTimerResetRegistrants are informed after Ecm timer is canceled or re-started
		private final RegistrantList mEcmTimerResetRegistrants = new RegistrantList();

		@@ -1736,11 +1734,6 @@ public class GsmCdmaPhone extends Phone {
		}
		}

		@Override
		public void setOnPostDialCharacter(Handler h, int what, Object obj) {
		mPostDialHandler = new Registrant(h, what, obj);
		}

		@Override
		public void setUiTTYMode(int uiTtyMode, Message onComplete) {
		if (mImsPhone != null) {

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

+44 −0

Original line number	Diff line number	Diff line
		@@ -302,6 +302,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		protected final RegistrantList mEmergencyCallToggledRegistrants
		= new RegistrantList();

		protected Registrant mPostDialHandler;

		private Looper mLooper; /* to insure registrants are in correct thread*/

		protected final Context mContext;
		@@ -2204,6 +2206,48 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		public void sendBurstDtmf(String dtmfString, int on, int off, Message onComplete) {
		}

		/**
		* Sets an event to be fired when the telephony system processes
		* a post-dial character on an outgoing call.<p>
		*
		* Messages of type <code>what</code> will be sent to <code>h</code>.
		* The <code>obj</code> field of these Message's will be instances of
		* <code>AsyncResult</code>. <code>Message.obj.result</code> will be
		* a Connection object.<p>
		*
		* Message.arg1 will be the post dial character being processed,
		* or 0 ('\0') if end of string.<p>
		*
		* If Connection.getPostDialState() == WAIT,
		* the application must call
		* {@link com.android.internal.telephony.Connection#proceedAfterWaitChar()
		* Connection.proceedAfterWaitChar()} or
		* {@link com.android.internal.telephony.Connection#cancelPostDial()
		* Connection.cancelPostDial()}
		* for the telephony system to continue playing the post-dial
		* DTMF sequence.<p>
		*
		* If Connection.getPostDialState() == WILD,
		* the application must call
		* {@link com.android.internal.telephony.Connection#proceedAfterWildChar
		* Connection.proceedAfterWildChar()}
		* or
		* {@link com.android.internal.telephony.Connection#cancelPostDial()
		* Connection.cancelPostDial()}
		* for the telephony system to continue playing the
		* post-dial DTMF sequence.<p>
		*
		* Only one post dial character handler may be set. <p>
		* Calling this method with "h" equal to null unsets this handler.<p>
		*/
		public void setOnPostDialCharacter(Handler h, int what, Object obj) {
		mPostDialHandler = new Registrant(h, what, obj);
		}

		public Registrant getPostDialHandler() {
		return mPostDialHandler;
		}

		/**
		* request to exit emergency call back mode
		* the caller should use setOnECMModeExitResponse

src/java/com/android/internal/telephony/PhoneInternalInterface.java

+0 −37

Original line number	Diff line number	Diff line
		@@ -652,43 +652,6 @@ public interface PhoneInternalInterface {
		*/
		void getNeighboringCids(Message response);

		/**
		* Sets an event to be fired when the telephony system processes
		* a post-dial character on an outgoing call.<p>
		*
		* Messages of type <code>what</code> will be sent to <code>h</code>.
		* The <code>obj</code> field of these Message's will be instances of
		* <code>AsyncResult</code>. <code>Message.obj.result</code> will be
		* a Connection object.<p>
		*
		* Message.arg1 will be the post dial character being processed,
		* or 0 ('\0') if end of string.<p>
		*
		* If Connection.getPostDialState() == WAIT,
		* the application must call
		* {@link com.android.internal.telephony.Connection#proceedAfterWaitChar()
		* Connection.proceedAfterWaitChar()} or
		* {@link com.android.internal.telephony.Connection#cancelPostDial()
		* Connection.cancelPostDial()}
		* for the telephony system to continue playing the post-dial
		* DTMF sequence.<p>
		*
		* If Connection.getPostDialState() == WILD,
		* the application must call
		* {@link com.android.internal.telephony.Connection#proceedAfterWildChar
		* Connection.proceedAfterWildChar()}
		* or
		* {@link com.android.internal.telephony.Connection#cancelPostDial()
		* Connection.cancelPostDial()}
		* for the telephony system to continue playing the
		* post-dial DTMF sequence.<p>
		*
		* Only one post dial character handler may be set. <p>
		* Calling this method with "h" equal to null unsets this handler.<p>
		*/
		void setOnPostDialCharacter(Handler h, int what, Object obj);


		/**
		* Mutes or unmutes the microphone for the active call. The microphone
		* is automatically unmuted if a call is answered, dialed, or resumed

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

+2 −8

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ public class ImsPhone extends ImsPhoneBase {
		ImsPhoneCallTracker mCT;
		private ArrayList <ImsPhoneMmiCode> mPendingMMIs = new ArrayList<ImsPhoneMmiCode>();

		Registrant mPostDialHandler;
		private ServiceState mSS = new ServiceState();

		// To redial silently through GSM or CDMA when dialing through IMS fails
		@@ -571,11 +570,6 @@ public class ImsPhone extends ImsPhoneBase {
		mCT.stopDtmf();
		}

		@Override
		public void setOnPostDialCharacter(Handler h, int what, Object obj) {
		mPostDialHandler = new Registrant(h, what, obj);
		}

		public void notifyIncomingRing() {
		if (DBG) Rlog.d(LOG_TAG, "notifyIncomingRing");
		AsyncResult ar = new AsyncResult(null, null, null);