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

Commit 890a7a99 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Status - allow null errors" am: 1c0d5f71

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

Change-Id: I0648ee0be222a7b563bc0a2142ea0d5e0a22fa29
parents efd896cc 1c0d5f71
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -130,13 +130,13 @@ status_t Status::readFromParcel(const Parcel& parcel) {
    }
    }


    // The remote threw an exception.  Get the message back.
    // The remote threw an exception.  Get the message back.
    String16 message;
    std::optional<String16> message;
    status = parcel.readString16(&message);
    status = parcel.readString16(&message);
    if (status != OK) {
    if (status != OK) {
        setFromStatusT(status);
        setFromStatusT(status);
        return status;
        return status;
    }
    }
    mMessage = String8(message);
    mMessage = String8(message.value_or(String16()));


    // Skip over the remote stack trace data
    // Skip over the remote stack trace data
    int32_t remote_stack_trace_header_size;
    int32_t remote_stack_trace_header_size;