commit 2ef48decc4a180e892c8203bd7f2c4e7277888b2
author Steven Moreland <smoreland@google.com> Tue Sep 25 14:41:06 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Sep 25 14:41:06 2018 -0700
tree f46bfc8fd7890fe1e61beff959fcaf836c513b09
parent 509524d23914c01513e2be31fd32b04a6da5af23
parent 3ee5c2c97a6ab72fbf74ee3115425b89ca561afc

Merge "libbinder: Status writeToParcel no OK on ERR"
am: 3ee5c2c97a

Change-Id: I505636c337378c26edc487e137a5e4b56e41413a

libs/binder/Status.cpp

diff --git a/libs/binder/Status.cpp b/libs/binder/Status.cpp
index a9d5055..e318a7f 100644
--- a/libs/binder/Status.cpp
+++ b/libs/binder/Status.cpp
@@ -136,7 +136,7 @@
     // Something really bad has happened, and we're not going to even
     // try returning rich error data.
     if (mException == EX_TRANSACTION_FAILED) {
-        return mErrorCode;
+        return mErrorCode == OK ? FAILED_TRANSACTION : mErrorCode;
     }
 
     status_t status = parcel->writeInt32(mException);