commit 1c0d5f71509131d2fd527d629cf706f9df0d6139
author Steven Moreland <smoreland@google.com> Tue Jul 13 17:03:03 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 13 17:03:03 2021 +0000
tree bcc9aa1d9da37be7706478d028abd858d61e069a
parent c1476aae0b47c5b831f06724dcb9374ac8f1ce95
parent 42454986b60bf717e377cb6bb2ba68c825d284be

Merge "libbinder: Status - allow null errors"

libs/binder/Status.cpp

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;