diff options
| author | 2023-02-01 04:27:11 +0000 | |
|---|---|---|
| committer | 2023-02-01 04:27:11 +0000 | |
| commit | 0db5336c355605a3c073a0c6450a15a88777ccab (patch) | |
| tree | 6858b299e3db20bea4dc7a1a94567865a8f8742e | |
| parent | e85ed05b60e71d52638be3a36afb82f3cc20dbfb (diff) | |
| parent | 8c967d54097930b9d85d1771a9b829452bb04991 (diff) | |
Merge "libbinder: Flush excess refs after single async transaction" am: e378a9e35b am: 69f4e01cae am: 8c967d5409
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2402157
Change-Id: I4505c1c18ff728621a4d23ec8c68622a4107adb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/RpcState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index b27f1028d4..1ea13f9a1c 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -1036,8 +1036,8 @@ processTransactInternalTailCall: return DEAD_OBJECT; } - if (it->second.asyncTodo.size() == 0) return OK; - if (it->second.asyncTodo.top().asyncNumber == it->second.asyncNumber) { + if (it->second.asyncTodo.size() != 0 && + it->second.asyncTodo.top().asyncNumber == it->second.asyncNumber) { LOG_RPC_DETAIL("Found next async transaction %" PRIu64 " on %" PRIu64, it->second.asyncNumber, addr); |