commit eb69424a2a1a66c26490c99a0c8e2e2e17308aa2
author Steven Moreland <smoreland@google.com> Tue Sep 25 15:01:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 25 15:01:38 2018 -0700
tree c9051b27c5c1e05844d93b21e9ff1d8057a594fe
parent 9468b0ade456827adedbe2fd8d35d7a3a9a31174
parent 8437841a95e201c45e4b285d53b64251271ef619

Status writeToParcel no OK on ERR am: 662378eaf6
am: 8437841a95

Change-Id: I1a939f99101ef8a325bcebd30e52ebcfb17b62b1

transport/HidlBinderSupport.cpp

diff --git a/transport/HidlBinderSupport.cpp b/transport/HidlBinderSupport.cpp
index ffcbcee..c9b2693 100644
--- a/transport/HidlBinderSupport.cpp
+++ b/transport/HidlBinderSupport.cpp
@@ -222,7 +222,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());