diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-07 22:41:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-07 22:41:22 +0000 |
| commit | dd051f640057a1240f467a9b87f048923915d174 (patch) | |
| tree | f8d0812242a41fcd75913c024621814c08075973 | |
| parent | 0c039916efd7d81e9616cf917645f618bbdc3112 (diff) | |
| parent | cabecdc66a44cdc55a3613382ef31c403eaa9dc7 (diff) | |
| download | native-dd051f640057a1240f467a9b87f048923915d174.tar.gz | |
Merge "Revert "Revert "libbinder: Flush excess refs after single async transaction""" am: cabecdc66a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2455762
Change-Id: Ia4e62a48f65e4c10427f02710574f5cce9c0ec5b
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); |