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

Commit a6294ad8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "no use readString16Inplace" am: b7c14e4c am: 13499e5a am:... 

Merge "no use readString16Inplace" am: b7c14e4c am: 13499e5a am: 002ef2d9 am: 49814c55 am: f674100b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1486503

Change-Id: Ic893809dde9447e6235f00592bb0b393fcc070e8
parents 38d598fb f674100b

camera/camera2/CaptureRequest.cpp

+4 −4
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ status_t CaptureRequest::readFromParcel(const android::Parcel* parcel) { 
    // Do not distinguish null arrays from 0-sized arrays.

    for (int32_t i = 0; i < size; ++i) {

        // Parcel.writeParcelableArray

        size_t len;

        const char16_t* className = parcel->readString16Inplace(&len);

        std::optional<std::string> className;

        parcel->readUtf8FromUtf16(&className);

        ALOGV("%s: Read surface class = %s", __FUNCTION__,

              className != NULL ? String8(className).string() : "<null>");

              className.value_or("<null>").c_str());



        if (className == NULL) {

        if (className == std::nullopt) {

            continue;

        }