commit a111998ee1cfa4cb359470a078291d682d5a1ec3
author Chih-hung Hsieh <chh@google.com> Wed Sep 26 02:24:07 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 26 02:24:07 2018 +0000
tree fb7aacda5b96e1a62edc99215918f883df11ca2f
parent 662378eaf66fb19ceb60aad4509c55843c78ff4d
parent 3833f201a9e4b269e7fc657706762d744444caa0

Merge "Add noexcept to move constructors and assignment operators."

transport/HidlBinderSupport.cpp

diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp
index add1f5e..a2ca5fa 100644
--- a/transport/HidlBinderSupport.cpp
+++ b/transport/HidlBinderSupport.cpp
@@ -212,7 +212,8 @@
     // Something really bad has happened, and we're not going to even
     // try returning rich error data.
     if (s.exceptionCode() == Status::EX_TRANSACTION_FAILED) {
-        return s.transactionError();
+        status_t status = s.transactionError();
+        return status == OK ? FAILED_TRANSACTION : status;
     }
 
     status_t status = parcel->writeInt32(s.exceptionCode());