am 464b2259: Merge "Fix NPE in CatService.encodeOptionalTags." into honeycomb-LTE (50e17002) · Commits · e / os / android_frameworks_base

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

+24 −19

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

	private void encodeOptionalTags(CommandDetails cmdDet,		private void encodeOptionalTags(CommandDetails cmdDet,
	ResultCode resultCode, Input cmdInput, ByteArrayOutputStream buf) {		ResultCode resultCode, Input cmdInput, ByteArrayOutputStream buf) {
	switch (AppInterface.CommandType.fromInt(cmdDet.typeOfCommand)) {		CommandType cmdType = AppInterface.CommandType.fromInt(cmdDet.typeOfCommand);
			if (cmdType != null) {
			switch (cmdType) {
	case GET_INKEY:		case GET_INKEY:
	// ETSI TS 102 384,27.22.4.2.8.4.2.		// ETSI TS 102 384,27.22.4.2.8.4.2.
	// If it is a response for GET_INKEY command and the response timeout		// If it is a response for GET_INKEY command and the response timeout
	@@ -395,6 +397,9 @@ public class CatService extends Handler implements AppInterface {
	CatLog.d(this, "encodeOptionalTags() Unsupported Cmd:" + cmdDet.typeOfCommand);		CatLog.d(this, "encodeOptionalTags() Unsupported Cmd:" + cmdDet.typeOfCommand);
	break;		break;
	}		}
			} else {
			CatLog.d(this, "encodeOptionalTags() bad Cmd:" + cmdDet.typeOfCommand);
			}
	}		}

	private void getInKeyResponse(ByteArrayOutputStream buf, Input cmdInput) {		private void getInKeyResponse(ByteArrayOutputStream buf, Input cmdInput) {