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

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

Merge "libgui: no use readString16Inplace" am: b1d6aaa8 am: eabc791b am:... 

Merge "libgui: no use readString16Inplace" am: b1d6aaa8 am: eabc791b am: 16524d22 am: e1b2728b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1487916

Change-Id: I52d5961f73218bef5fbb4a769806ba54dbc252ff
parents 0fc3549a e1b2728b

libs/gui/view/Surface.cpp

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



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

    size_t len;

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

    if (str != nullptr) {

        return String16(str, len);

    } else {

        return String16();

    }

    std::optional<String16> str;

    parcel->readString16(&str);

    return str.value_or(String16());

}



} // namespace view