commit 69f4e01cae01fcd95d15224775ef7e444b47bd8c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 01 03:05:49 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 01 03:05:49 2023 +0000
tree dd4dc78bd4b869753b45e491ec470d2440ce6188
parent bdbeb343693c498861f194328cf6609369c26749
parent e378a9e35bdfd929b75e0ccca303a544f03c424c

Merge "libbinder: Flush excess refs after single async transaction" am: e378a9e35b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2402157

Change-Id: I60342bd9d4d80f07a46f211293a210df148cddb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/RpcState.cpp

diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp
index b27f102..1ea13f9 100644
--- a/libs/binder/RpcState.cpp
+++ b/libs/binder/RpcState.cpp
@@ -1036,8 +1036,8 @@
                 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);