commit 8437841a95e201c45e4b285d53b64251271ef619
author Steven Moreland <smoreland@google.com> Tue Sep 25 14:38:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 25 14:38:29 2018 -0700
tree c9051b27c5c1e05844d93b21e9ff1d8057a594fe
parent 91feb47dc13337e4f5a172c971058f4058333cb1
parent 662378eaf66fb19ceb60aad4509c55843c78ff4d

Status writeToParcel no OK on ERR
am: 662378eaf6

Change-Id: I0a8f7856cc69ae487f904f772e9ed15a974314eb

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());