commit bb0ed627bd1008a82ef497c696bd7c5b3c0678a9
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 14 06:30:01 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 14 06:30:01 2023 +0000
tree d4fd124845f2a606cf3208924f61c104d632f714
parent b2ed830b7ab522f06d34a0fde93094b9648a7166
parent 4c81465955c0a9270d6c4a48ca79e1d7d4d17924

Merge "Revert "libbinder: Flush excess refs after single async transaction"" am: 2aef5c6509 am: d42bc5a9e9 am: 4c81465955

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

Change-Id: I07ef069f8fa13243ebe66ed77557c2334b047045
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 1ea13f9..b27f102 100644
--- a/libs/binder/RpcState.cpp
+++ b/libs/binder/RpcState.cpp
@@ -1036,8 +1036,8 @@
                 return DEAD_OBJECT;
             }
 
-            if (it->second.asyncTodo.size() != 0 &&
-                it->second.asyncTodo.top().asyncNumber == it->second.asyncNumber) {
+            if (it->second.asyncTodo.size() == 0) return OK;
+            if (it->second.asyncTodo.top().asyncNumber == it->second.asyncNumber) {
                 LOG_RPC_DETAIL("Found next async transaction %" PRIu64 " on %" PRIu64,
                                it->second.asyncNumber, addr);