am a27353c1: Cat: Generalize stk into cat (42b23da9) · Commits · e / os / android_frameworks_base

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

+20 −20

Original line number	Diff line number	Diff line
		@@ -73,10 +73,10 @@ public abstract class BaseCommands implements CommandsInterface {
		protected Registrant mSmsOnSimRegistrant;
		protected Registrant mSmsStatusRegistrant;
		protected Registrant mSsnRegistrant;
		protected Registrant mStkSessionEndRegistrant;
		protected Registrant mStkProCmdRegistrant;
		protected Registrant mStkEventRegistrant;
		protected Registrant mStkCallSetUpRegistrant;
		protected Registrant mCatSessionEndRegistrant;
		protected Registrant mCatProCmdRegistrant;
		protected Registrant mCatEventRegistrant;
		protected Registrant mCatCallSetUpRegistrant;
		protected Registrant mIccSmsFullRegistrant;
		protected Registrant mEmergencyCallbackModeRegistrant;
		protected Registrant mIccRefreshRegistrant;
		@@ -395,36 +395,36 @@ public abstract class BaseCommands implements CommandsInterface {
		mSsnRegistrant.clear();
		}

		public void setOnStkSessionEnd(Handler h, int what, Object obj) {
		mStkSessionEndRegistrant = new Registrant (h, what, obj);
		public void setOnCatSessionEnd(Handler h, int what, Object obj) {
		mCatSessionEndRegistrant = new Registrant (h, what, obj);
		}

		public void unSetOnStkSessionEnd(Handler h) {
		mStkSessionEndRegistrant.clear();
		public void unSetOnCatSessionEnd(Handler h) {
		mCatSessionEndRegistrant.clear();
		}

		public void setOnStkProactiveCmd(Handler h, int what, Object obj) {
		mStkProCmdRegistrant = new Registrant (h, what, obj);
		public void setOnCatProactiveCmd(Handler h, int what, Object obj) {
		mCatProCmdRegistrant = new Registrant (h, what, obj);
		}

		public void unSetOnStkProactiveCmd(Handler h) {
		mStkProCmdRegistrant.clear();
		public void unSetOnCatProactiveCmd(Handler h) {
		mCatProCmdRegistrant.clear();
		}

		public void setOnStkEvent(Handler h, int what, Object obj) {
		mStkEventRegistrant = new Registrant (h, what, obj);
		public void setOnCatEvent(Handler h, int what, Object obj) {
		mCatEventRegistrant = new Registrant (h, what, obj);
		}

		public void unSetOnStkEvent(Handler h) {
		mStkEventRegistrant.clear();
		public void unSetOnCatEvent(Handler h) {
		mCatEventRegistrant.clear();
		}

		public void setOnStkCallSetUp(Handler h, int what, Object obj) {
		mStkCallSetUpRegistrant = new Registrant (h, what, obj);
		public void setOnCatCallSetUp(Handler h, int what, Object obj) {
		mCatCallSetUpRegistrant = new Registrant (h, what, obj);
		}

		public void unSetOnStkCallSetUp(Handler h) {
		mStkCallSetUpRegistrant.clear();
		public void unSetOnCatCallSetUp(Handler h) {
		mCatCallSetUpRegistrant.clear();
		}

		public void setOnIccSmsFull(Handler h, int what, Object obj) {

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

+12 −12

Original line number	Diff line number	Diff line
		@@ -374,48 +374,48 @@ public interface CommandsInterface {
		void unSetOnSuppServiceNotification(Handler h);

		/**
		* Sets the handler for Session End Notifications for STK.
		* Sets the handler for Session End Notifications for CAT.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnStkSessionEnd(Handler h, int what, Object obj);
		void unSetOnStkSessionEnd(Handler h);
		void setOnCatSessionEnd(Handler h, int what, Object obj);
		void unSetOnCatSessionEnd(Handler h);

		/**
		* Sets the handler for Proactive Commands for STK.
		* Sets the handler for Proactive Commands for CAT.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnStkProactiveCmd(Handler h, int what, Object obj);
		void unSetOnStkProactiveCmd(Handler h);
		void setOnCatProactiveCmd(Handler h, int what, Object obj);
		void unSetOnCatProactiveCmd(Handler h);

		/**
		* Sets the handler for Event Notifications for STK.
		* Sets the handler for Event Notifications for CAT.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnStkEvent(Handler h, int what, Object obj);
		void unSetOnStkEvent(Handler h);
		void setOnCatEvent(Handler h, int what, Object obj);
		void unSetOnCatEvent(Handler h);

		/**
		* Sets the handler for Call Set Up Notifications for STK.
		* Sets the handler for Call Set Up Notifications for CAT.
		* Unlike the register* methods, there's only one notification handler
		*
		* @param h Handler for notification message.
		* @param what User-defined message code.
		* @param obj User object.
		*/
		void setOnStkCallSetUp(Handler h, int what, Object obj);
		void unSetOnStkCallSetUp(Handler h);
		void setOnCatCallSetUp(Handler h, int what, Object obj);
		void unSetOnCatCallSetUp(Handler h);

		/**
		* Enables/disbables supplementary service related notifications from

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -2481,8 +2481,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_UNSOL_STK_SESSION_END:
		if (RILJ_LOGD) unsljLog(response);

		if (mStkSessionEndRegistrant != null) {
		mStkSessionEndRegistrant.notifyRegistrant(
		if (mCatSessionEndRegistrant != null) {
		mCatSessionEndRegistrant.notifyRegistrant(
		new AsyncResult (null, ret, null));
		}
		break;
		@@ -2490,8 +2490,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_UNSOL_STK_PROACTIVE_COMMAND:
		if (RILJ_LOGD) unsljLogRet(response, ret);

		if (mStkProCmdRegistrant != null) {
		mStkProCmdRegistrant.notifyRegistrant(
		if (mCatProCmdRegistrant != null) {
		mCatProCmdRegistrant.notifyRegistrant(
		new AsyncResult (null, ret, null));
		}
		break;
		@@ -2499,8 +2499,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_UNSOL_STK_EVENT_NOTIFY:
		if (RILJ_LOGD) unsljLogRet(response, ret);

		if (mStkEventRegistrant != null) {
		mStkEventRegistrant.notifyRegistrant(
		if (mCatEventRegistrant != null) {
		mCatEventRegistrant.notifyRegistrant(
		new AsyncResult (null, ret, null));
		}
		break;
		@@ -2508,8 +2508,8 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		case RIL_UNSOL_STK_CALL_SETUP:
		if (RILJ_LOGD) unsljLogRet(response, ret);

		if (mStkCallSetUpRegistrant != null) {
		mStkCallSetUpRegistrant.notifyRegistrant(
		if (mCatCallSetUpRegistrant != null) {
		mCatCallSetUpRegistrant.notifyRegistrant(
		new AsyncResult (null, ret, null));
		}
		break;

telephony/java/com/android/internal/telephony/cat/AppInterface.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -14,29 +14,29 @@
		* limitations under the License.
		*/

		package com.android.internal.telephony.gsm.stk;
		package com.android.internal.telephony.cat;

		/**
		* Interface for communication between STK App and STK Telephony
		* Interface for communication between STK App and CAT Telephony
		*
		* {@hide}
		*/
		public interface AppInterface {

		/*
		* Intent's actions which are broadcasted by the Telephony once a new STK
		* Intent's actions which are broadcasted by the Telephony once a new CAT
		* proactive command, session end arrive.
		*/
		public static final String STK_CMD_ACTION =
		public static final String CAT_CMD_ACTION =
		"android.intent.action.stk.command";
		public static final String STK_SESSION_END_ACTION =
		public static final String CAT_SESSION_END_ACTION =
		"android.intent.action.stk.session_end";

		/*
		* Callback function from app to telephony to pass a result code and user's
		* input back to the SIM.
		* input back to the ICC.
		*/
		void onCmdResponse(StkResponseMessage resMsg);
		void onCmdResponse(CatResponseMessage resMsg);

		/*
		* Enumeration for representing "Type of Command" of proactive commands.

telephony/java/com/android/internal/telephony/cat/BerTlv.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.internal.telephony.gsm.stk;
		package com.android.internal.telephony.cat;

		import java.util.List;