commit afb9523bc81aa2f07c4ee9a7e122cb0bcba0e903
author Steven Moreland <smoreland@google.com> Tue Oct 30 17:07:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 30 17:07:25 2018 -0700
tree 2a16858fcc8d3e9b0419a8ecedcf735984c2da1e
parent 6cef3ae48c904b2e5666a5cf8f406198e205fbaf
parent 41d2c202a71cda7b6f835411e51b79f136bccdeb

Merge "libbinder_ndk: prune AParcel_readStatusHeader ret" am: 4f96a5f03b am: c60a704937
am: 41d2c202a7

Change-Id: I8e2b643416ac922ba3bd74efb572792fe14542db

libs/binder/ndk/parcel.cpp

diff --git a/libs/binder/ndk/parcel.cpp b/libs/binder/ndk/parcel.cpp
index cfe0f46..5ac3965 100644
--- a/libs/binder/ndk/parcel.cpp
+++ b/libs/binder/ndk/parcel.cpp
@@ -216,10 +216,10 @@
 binder_status_t AParcel_readStatusHeader(const AParcel* parcel, AStatus** status) {
     ::android::binder::Status bstatus;
     binder_status_t ret = PruneStatusT(bstatus.readFromParcel(*parcel->get()));
-    if (ret == EX_NONE) {
+    if (ret == STATUS_OK) {
         *status = new AStatus(std::move(bstatus));
     }
-    return ret;
+    return PruneStatusT(ret);
 }
 
 binder_status_t AParcel_writeString(AParcel* parcel, const char* string, size_t length) {