commit 41d2c202a71cda7b6f835411e51b79f136bccdeb
author Steven Moreland <smoreland@google.com> Tue Oct 30 16:57:56 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 30 16:57:56 2018 -0700
tree 305452df73a237d71c085c5a6f08a710d0d37dac
parent a6a03b1054d23e4dd1b8d06472b7675741b281b6
parent c60a7049377127183cf79d4ce36032311dbbd802

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

Change-Id: Ic203c440826e9ce084d9a72076922150f2c787fb

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) {