commit c41bddf0ef1b2641c752ed13df4d71c384928dfb
author Steven Moreland <smoreland@google.com> Tue Sep 25 15:22:57 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 25 15:22:57 2018 -0700
tree 45e4be222a3b49adb7eadf799b8e85f1b8377964
parent 63b22f5d3ae6f99de64c90e357abdc80b8d46785
parent eb69424a2a1a66c26490c99a0c8e2e2e17308aa2

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

Change-Id: I3b977398666d4f3e7ce81df0ae685d21012ca616

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