| commit | 3ee5c2c97a6ab72fbf74ee3115425b89ca561afc | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Sep 25 21:16:55 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 25 21:16:55 2018 +0000 |
| tree | e9395380cac572f34d6a34f3a698171286a36743 | |
| parent | 2dcf3d8cea0a5b0e790a42242ca89bd82df325ad [diff] | |
| parent | 4ca4621f7a75844d85ff4b8c6b2a63d5aa993fa4 [diff] |
Merge "libbinder: Status writeToParcel no OK on ERR"
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);