| commit | 890a7a999d9ec5db1f949112f140754d81dcbdb4 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Jul 13 17:19:08 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 13 17:19:08 2021 +0000 |
| tree | bcc9aa1d9da37be7706478d028abd858d61e069a | |
| parent | efd896cc29aeb2f3adbd0d51bdc6c7e3b06027fe [diff] | |
| parent | 1c0d5f71509131d2fd527d629cf706f9df0d6139 [diff] |
Merge "libbinder: Status - allow null errors" am: 1c0d5f7150 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1764022 Change-Id: I0648ee0be222a7b563bc0a2142ea0d5e0a22fa29
diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp index b5a078c..a44c578 100644 --- a/libs/binder/Status.cpp +++ b/libs/binder/Status.cpp
@@ -130,13 +130,13 @@ } // The remote threw an exception. Get the message back. - String16 message; + std::optional<String16> message; status = parcel.readString16(&message); if (status != OK) { setFromStatusT(status); return status; } - mMessage = String8(message); + mMessage = String8(message.value_or(String16())); // Skip over the remote stack trace data int32_t remote_stack_trace_header_size;