Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair (8deed914) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/BaseCommands.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ public abstract class BaseCommands implements CommandsInterface {
		protected RegistrantList mT53ClirInfoRegistrants = new RegistrantList();
		protected RegistrantList mT53AudCntrlInfoRegistrants = new RegistrantList();
		protected RegistrantList mRingbackToneRegistrants = new RegistrantList();
		protected RegistrantList mResendIncallMuteRegistrants = new RegistrantList();

		protected Registrant mSMSRegistrant;
		protected Registrant mNITZTimeRegistrant;
		@@ -579,6 +580,15 @@ public abstract class BaseCommands implements CommandsInterface {
		mRingbackToneRegistrants.remove(h);
		}

		public void registerForResendIncallMute(Handler h, int what, Object obj) {
		Registrant r = new Registrant (h, what, obj);
		mResendIncallMuteRegistrants.add(r);
		}

		public void unregisterForResendIncallMute(Handler h) {
		mResendIncallMuteRegistrants.remove(h);
		}

		//***** Protected Methods
		/**
		* Store new RadioState and send notification based on the changes

+12 −0

Original line number	Diff line number	Diff line
		@@ -537,6 +537,18 @@ public interface CommandsInterface {
		void registerForRingbackTone(Handler h, int what, Object obj);
		void unregisterForRingbackTone(Handler h);

		/**
		* Registers the handler when mute/unmute need to be resent to get
		* uplink audio during a call.<p>
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*
		*/
		void registerForResendIncallMute(Handler h, int what, Object obj);
		void unregisterForResendIncallMute(Handler h);

		/**
		* Supply the ICC PIN to the ICC card
		*

+10 −0

Original line number	Diff line number	Diff line
		@@ -407,6 +407,16 @@ public interface Phone {

		void unregisterForRingbackTone(Handler h);

		/**
		* Registers the handler to reset the uplink mute state to get
		* uplink audio.
		*/
		void registerForResendIncallMute(Handler h, int what, Object obj);

		/**
		* Unregisters for resend incall mute notifications.
		*/
		void unregisterForResendIncallMute(Handler h);

		/**
		* Notifies when a voice connection has disconnected, either due to local

+10 −0

Original line number	Diff line number	Diff line
		@@ -492,6 +492,16 @@ public abstract class PhoneBase extends Handler implements Phone {
		mCM.unregisterForRingbackTone(h);
		}

		// Inherited documentation suffices.
		public void registerForResendIncallMute(Handler h, int what, Object obj) {
		mCM.registerForResendIncallMute(h,what,obj);
		}

		// Inherited documentation suffices.
		public void unregisterForResendIncallMute(Handler h) {
		mCM.unregisterForResendIncallMute(h);
		}

		/**
		* Subclasses of Phone probably want to replace this with a
		* version scoped to their packages

+8 −0

Original line number	Diff line number	Diff line
		@@ -343,6 +343,14 @@ public class PhoneProxy extends Handler implements Phone {
		mActivePhone.unregisterForRingbackTone(h);
		}

		public void registerForResendIncallMute(Handler h, int what, Object obj) {
		mActivePhone.registerForResendIncallMute(h,what,obj);
		}

		public void unregisterForResendIncallMute(Handler h) {
		mActivePhone.unregisterForResendIncallMute(h);
		}

		public boolean getIccRecordsLoaded() {
		return mActivePhone.getIccRecordsLoaded();
		}