Merge "Telephony: add support for additional information" (c06ff6ba) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ public class CatResponseMessage {
		String usersInput = null;
		boolean usersYesNoSelection = false;
		boolean usersConfirm = false;

		boolean includeAdditionalInfo = false;
		int additionalInfo = 0;
		public CatResponseMessage(CatCmdMessage cmdMsg) {
		this.cmdDet = cmdMsg.mCmdDet;
		}
		@@ -48,6 +49,11 @@ public class CatResponseMessage {
		usersConfirm = confirm;
		}

		public void setAdditionalInfo(int info) {
		this.includeAdditionalInfo = true;
		this.additionalInfo = info;
		}

		CommandDetails getCmdDetails() {
		return cmdDet;
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -719,6 +719,7 @@ public class CatService extends Handler implements AppInterface {
		case PRFRMD_WITH_MODIFICATION:
		case PRFRMD_NAA_NOT_ACTIVE:
		case PRFRMD_TONE_NOT_PLAYED:
		case TERMINAL_CRNTLY_UNABLE_TO_PROCESS:
		switch (AppInterface.CommandType.fromInt(cmdDet.typeOfCommand)) {
		case SET_UP_MENU:
		helpRequired = resMsg.resCode == ResultCode.HELP_INFO_REQUIRED;
		@@ -763,7 +764,8 @@ public class CatService extends Handler implements AppInterface {
		default:
		return;
		}
		sendTerminalResponse(cmdDet, resMsg.resCode, false, 0, resp);
		sendTerminalResponse(cmdDet, resMsg.resCode, resMsg.includeAdditionalInfo,
		resMsg.additionalInfo, resp);
		mCurrntCmd = null;
		}