commit 4f96a5f03beb692d4506bb9cb75af860af11214d
author Steven Moreland <smoreland@google.com> Tue Oct 30 23:45:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 30 23:45:39 2018 +0000
tree d187007d7df8dff1311d149a91e3751493325f8a
parent f1a1b025926f10ca6aa62c1ca9a4f32c86f4a958
parent c1a11b86272090ed8cda3ee2bd3aab8ec068b41f

Merge "libbinder_ndk: prune AParcel_readStatusHeader ret"

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