Merge "Merge "Merge "Add FLAG_RECEIVER_FOREGROUND to CatService broadcast intents.""" (87ccf2de) · Commits · e / os / android_frameworks_opt_telephony

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -65,12 +65,6 @@ public interface AppInterface {
		*/
		void onCmdResponse(CatResponseMessage resMsg);

		/*
		* Callback function from app to telephony when the app is ready, that is, the app is up
		* and running and is ready to process commands received from telephony.
		*/
		void onStkAppReady();

		/*
		* Enumeration for representing "Type of Command" of proactive commands.
		* Those are the only commands which are supported by the Telephony. Any app

src/java/com/android/internal/telephony/cat/CatService.java

+7 −18

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ public class CatService extends Handler implements AppInterface {

		protected RilMessageDecoder mMsgDecoder = null;
		protected boolean mStkAppInstalled = false;
		protected boolean mIsStkAppReady = false;

		protected UiccController mUiccController;
		protected CardState mCardState = CardState.CARDSTATE_ABSENT;
		@@ -438,6 +437,7 @@ public class CatService extends Handler implements AppInterface {

		protected void broadcastCatCmdIntent(CatCmdMessage cmdMsg) {
		Intent intent = new Intent(AppInterface.CAT_CMD_ACTION);
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		intent.putExtra("STK CMD", cmdMsg);
		mContext.sendBroadcast(intent);
		}
		@@ -451,6 +451,7 @@ public class CatService extends Handler implements AppInterface {

		mCurrntCmd = mMenuCmd;
		Intent intent = new Intent(AppInterface.CAT_SESSION_END_ACTION);
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		mContext.sendBroadcast(intent);
		}

		@@ -832,6 +833,7 @@ public class CatService extends Handler implements AppInterface {
		CatLog.d(this, "Broadcasting CAT Alpha message from card: " + alphaString);
		Intent intent = new Intent(AppInterface.CAT_ALPHA_NOTIFY_ACTION);
		intent.putExtra(AppInterface.ALPHA_STRING, alphaString);
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		mContext.sendBroadcast(intent);
		}
		/**
		@@ -843,6 +845,7 @@ public class CatService extends Handler implements AppInterface {
		protected void broadcastCardStateAndIccRefreshResp(CardState cardState,
		IccRefreshResponse iccRefreshState) {
		Intent intent = new Intent(AppInterface.CAT_ICC_STATUS_CHANGE);
		intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
		boolean cardPresent = (cardState == CardState.CARDSTATE_PRESENT);

		if (iccRefreshState != null) {
		@@ -860,14 +863,6 @@ public class CatService extends Handler implements AppInterface {
		mContext.sendBroadcast(intent);
		}

		protected void reportStkIsRunning() {
		CatLog.d(this, "mCardState = " + mCardState +
		" mIsStkAppReady = " + mIsStkAppReady);
		if ((mCardState == CardState.CARDSTATE_PRESENT) && (mIsStkAppReady == true)) {
		mCmdIf.reportStkServiceIsRunning(null);
		}
		}

		@Override
		public synchronized void onCmdResponse(CatResponseMessage resMsg) {
		if (resMsg == null) {
		@@ -878,13 +873,6 @@ public class CatService extends Handler implements AppInterface {
		msg.sendToTarget();
		}

		@Override
		public void onStkAppReady(){
		CatLog.d(this, "StkAppReady notification received");
		mIsStkAppReady = true;
		reportStkIsRunning();
		}

		private boolean validateResponse(CatResponseMessage resMsg) {
		boolean validResponse = false;
		if ((resMsg.mCmdDet.typeOfCommand == CommandType.SET_UP_EVENT_LIST.value())
		@@ -1061,8 +1049,9 @@ public class CatService extends Handler implements AppInterface {
		broadcastCardStateAndIccRefreshResp(newState, null);
		} else if (oldState != CardState.CARDSTATE_PRESENT &&
		newState == CardState.CARDSTATE_PRESENT) {
		// Card moved to PRESENT STATE
		reportStkIsRunning();
		// Card moved to PRESENT STATE.
		mCmdIf.reportStkServiceIsRunning(null);
		}

		}
		}