diff options
| author | 2023-03-07 23:16:32 +0000 | |
|---|---|---|
| committer | 2023-03-07 23:16:32 +0000 | |
| commit | 4621096be89f510f4777e50f70bd12db123f7c71 (patch) | |
| tree | a151622337e9a3e535ace261806981b6997198b8 | |
| parent | 92e6c9b28807e91f239782c5b339b6defd08512e (diff) | |
| parent | dd051f640057a1240f467a9b87f048923915d174 (diff) | |
Merge "Revert "Revert "libbinder: Flush excess refs after single async transaction""" am: cabecdc66a am: dd051f6400
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2455762
Change-Id: Ifdda6544ba739a97e96cf342d3523091edefcc7f
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 2b0e5bae0d..38bd081b8b 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); |