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

Commit 33bddff1 authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Use resizeOutVector in IncidentReportArg" am: 844427d5 am: 681bd661... 

Merge "Use resizeOutVector in IncidentReportArg" am: 844427d5 am: 681bd661 am: a5494e76 am: 6b8c9f04

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2596770



Change-Id: I0b7b0de89638f140ac0349e2cea4c32c048b7c59
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4d9a225 6b8c9f04

libs/incident/src/IncidentReportArgs.cpp

+3 −4
Original line number Diff line number Diff line
@@ -133,13 +133,12 @@ IncidentReportArgs::readFromParcel(const Parcel* in) 
        mSections.insert(section);

    }



    int32_t headerCount;

    err = in->readInt32(&headerCount);

    err = in->resizeOutVector<vector<uint8_t>>(&mHeaders);

    if (err != NO_ERROR) {

        return err;

    }

    mHeaders.resize(headerCount);

    for (int i=0; i<headerCount; i++) {



    for (int i=0; i<mHeaders.size(); i++) {

        err = in->readByteVector(&mHeaders[i]);

        if (err != NO_ERROR) {

            return err;