Merge "Add unset and setOnIccRefresh." (5e4ab528) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -458,6 +458,9 @@ public abstract class BaseCommands implements CommandsInterface {
	Registrant r = new Registrant (h, what, obj);		Registrant r = new Registrant (h, what, obj);
	mIccRefreshRegistrants.add(r);		mIccRefreshRegistrants.add(r);
	}		}
			public void setOnIccRefresh(Handler h, int what, Object obj) {
			registerForIccRefresh(h, what, obj);
			}

	public void setEmergencyCallbackMode(Handler h, int what, Object obj) {		public void setEmergencyCallbackMode(Handler h, int what, Object obj) {
	mEmergencyCallbackModeRegistrant = new Registrant (h, what, obj);		mEmergencyCallbackModeRegistrant = new Registrant (h, what, obj);
	@@ -466,6 +469,9 @@ public abstract class BaseCommands implements CommandsInterface {
	public void unregisterForIccRefresh(Handler h) {		public void unregisterForIccRefresh(Handler h) {
	mIccRefreshRegistrants.remove(h);		mIccRefreshRegistrants.remove(h);
	}		}
			public void unsetOnIccRefresh(Handler h) {
			unregisterForIccRefresh(h);
			}

	public void setOnCallRing(Handler h, int what, Object obj) {		public void setOnCallRing(Handler h, int what, Object obj) {
	mRingRegistrant = new Registrant (h, what, obj);		mRingRegistrant = new Registrant (h, what, obj);

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -360,6 +360,9 @@ public interface CommandsInterface {
	void registerForIccRefresh(Handler h, int what, Object obj);		void registerForIccRefresh(Handler h, int what, Object obj);
	void unregisterForIccRefresh(Handler h);		void unregisterForIccRefresh(Handler h);

			void setOnIccRefresh(Handler h, int what, Object obj);
			void unsetOnIccRefresh(Handler h);

	/**		/**
	* Sets the handler for RING notifications.		* Sets the handler for RING notifications.
	* Unlike the register* methods, there's only one notification handler		* Unlike the register* methods, there's only one notification handler