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

Commit b1d6aaa8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "libgui: no use readString16Inplace"

parents 18d7a909 46f79a21

libs/gui/view/Surface.cpp

+3 −7
Original line number Original line Diff line number Diff line
@@ -72,13 +72,9 @@ status_t Surface::readFromParcel(const Parcel* parcel, bool nameAlreadyRead) { 
}

}





String16 Surface::readMaybeEmptyString16(const Parcel* parcel) {

String16 Surface::readMaybeEmptyString16(const Parcel* parcel) {

    size_t len;

    std::optional<String16> str;

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

    parcel->readString16(&str);

    if (str != nullptr) {

    return str.value_or(String16());

        return String16(str, len);

    } else {

        return String16();

    }

}

}





} // namespace view

} // namespace view