commit df25f0d165f829d5d4d1437ecb99ab67ec11adc9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 08 01:01:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 08 01:01:48 2023 +0000
tree 6bec8d0de92e9af32c8f17cc7f85cb685b1961ee
parent 00219b63208fd8e71ab8047fdadd5eb0d911207c
parent b55592b4c3c0d657c4dcec2902ee682a21a866da

Merge "Revert "Revert "libbinder: Flush excess refs after single async transaction""" am: cabecdc66a am: dd051f6400 am: 4621096be8 am: eb08b23287 am: b55592b4c3

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

Change-Id: I9742ec7d809b4db7f6d21333de1167bda87470fc
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 2b0e5ba..38bd081 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);