Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b68779a authored by Wink Saville's avatar Wink Saville
Browse files

Fix NPE in CatService.encodeOptionalTags. 

If cmdDet.typeOfCommand is bad fromInt returns null we now log the
error instead of causing a Null Pointer Exception.

Change-Id: Id6a0d295d988c2bdbd46a0c0dd6b20f5baf02b27
parent 0b6d0445

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

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


    private void encodeOptionalTags(CommandDetails cmdDet,

            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:

                    // ETSI TS 102 384,27.22.4.2.8.4.2.

                    // 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);

                    break;

            }

        } else {

            CatLog.d(this, "encodeOptionalTags() bad Cmd:" + cmdDet.typeOfCommand);

        }

    }



    private void getInKeyResponse(ByteArrayOutputStream buf, Input cmdInput) {