diff options
| author | 2021-06-02 17:47:10 +0000 | |
|---|---|---|
| committer | 2021-06-02 17:47:10 +0000 | |
| commit | 7eda99f10da3045056e15d6361c3a57a661d86f9 (patch) | |
| tree | 290e0a6246ab03f41ac70bb5468e7a2e041d9446 /libs/binder/Parcel.cpp | |
| parent | e8663b6968f98b7d390f593c99446b4e5c79d6b2 (diff) | |
| parent | e54384bbd4d4c3b433b180e8f25c15266ae21228 (diff) | |
Merge "libbinder: onBinder* respect termination" am: e54384bbd4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1722994
Change-Id: I9b1c3139ca29e9ed234cda74fed48e9b9063777b
Diffstat (limited to 'libs/binder/Parcel.cpp')
| -rw-r--r-- | libs/binder/Parcel.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 9795348a0c..d19b4d83fb 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -283,9 +283,10 @@ status_t Parcel::unflattenBinder(sp<IBinder>* out) const if (isNull & 1) { auto addr = RpcAddress::zero(); - status_t status = addr.readFromParcel(*this); - if (status != OK) return status; - binder = mSession->state()->onBinderEntering(mSession, addr); + if (status_t status = addr.readFromParcel(*this); status != OK) return status; + if (status_t status = mSession->state()->onBinderEntering(mSession, addr, &binder); + status != OK) + return status; } return finishUnflattenBinder(binder, out); |