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

Commit 5d6a095e authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Do not clear good TLVs when a error occurs decoding."

parents d71b9154 7c27ac64

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

+2 −2
Original line number Diff line number Diff line
@@ -427,11 +427,11 @@ public class CatService extends Handler implements AppInterface { 
                    }

                    break;

                default:

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

                    CatLog.d(this, "encodeOptionalTags() Unsupported Cmd details=" + cmdDet);

                    break;

            }

        } else {

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

            CatLog.d(this, "encodeOptionalTags() bad Cmd details=" + cmdDet);

        }

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ class ComprehensionTlv { 
                startIndex = ctlv.mValueIndex + ctlv.mLength;

            } else {

                CatLog.d(LOG_TAG, "decodeMany: ctlv is null, stop decoding");

                items.clear();

                break;

            }

        }