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

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

Merge "[maguro] Update COMPREHENSION-TLV parser in CAT" into ics-mr0

parents b9619430 f0845545
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
/*
 * Copyright (C) 2006 The Android Open Source Project
 * Copyright (C) 2011 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ import java.util.List;
 * {@hide}
 */
class ComprehensionTlv {
    private static final String LOG_TAG = "ComprehensionTlv";
    private int mTag;
    private boolean mCr;
    private int mLength;
@@ -88,8 +89,13 @@ class ComprehensionTlv {
        int endIndex = data.length;
        while (startIndex < endIndex) {
            ComprehensionTlv ctlv = ComprehensionTlv.decode(data, startIndex);
            if (ctlv != null) {
                items.add(ctlv);
                startIndex = ctlv.mValueIndex + ctlv.mLength;
            } else {
                CatLog.d(LOG_TAG, "decodeMany: ctlv is null, stop decoding");
                break;
            }
        }

        return items;