Merge change 25870 into eclair (b7da7dd0) · Commits · e / os / android_frameworks_base

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

+10 −0

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

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

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

		public void unregisterForRingbackTone(Handler h) {
		mRingbackToneRegistrants.remove(h);
		}

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,17 @@ public interface CommandsInterface {
		void registerForCdmaOtaProvision(Handler h,int what, Object obj);
		void unregisterForCdmaOtaProvision(Handler h);

		/**
		* Registers the handler when out-band ringback tone is needed.<p>
		*
		* Messages received from this:
		* Message.obj will be an AsyncResult
		* AsyncResult.userObj = obj
		* AsyncResult.result = boolean. <p>
		*/
		void registerForRingbackTone(Handler h, int what, Object obj);
		void unregisterForRingbackTone(Handler h);

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

+17 −0

Original line number	Diff line number	Diff line
		@@ -379,6 +379,23 @@ public interface Phone {

		void unregisterForIncomingRing(Handler h);

		/**
		* Notifies when out-band ringback tone is needed.<p>
		*
		* Messages received from this:
		* Message.obj will be an AsyncResult
		* AsyncResult.userObj = obj
		* AsyncResult.result = boolean, true to start play ringback tone
		* and false to stop. <p>
		*/
		void registerForRingbackTone(Handler h, int what, Object obj);

		/**
		* Unregisters for ringback tone notification.
		*/

		void unregisterForRingbackTone(Handler h);


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

+10 −0

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

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

		// Inherited documentation suffices.
		public void unregisterForRingbackTone(Handler h) {
		mCM.unregisterForRingbackTone(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
		@@ -331,6 +331,14 @@ public class PhoneProxy extends Handler implements Phone {
		mActivePhone.unregisterForEcmTimerReset(h);
		}

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

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

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