Merge "libbinder: Fix FD handling for queued oneway RPC transactions" am: 4ba1ef38c5 am: 9380acff07 am: e959092df9 am: 3e8ce5740d am: 9401313bf8

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

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

1 files changed, 2 insertions, 0 deletions

diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp
index c411f4fed3..7067328358 100644
--- a/libs/binder/RpcState.cpp
+++ b/libs/binder/RpcState.cpp
@@ -886,6 +886,7 @@ processTransactInternalTailCall:
                 it->second.asyncTodo.push(BinderNode::AsyncTodo{
                         .ref = target,
                         .data = std::move(transactionData),
+                        .ancillaryFds = std::move(ancillaryFds),
                         .asyncNumber = transaction->asyncNumber,
                 });
 
@@ -1046,6 +1047,7 @@ processTransactInternalTailCall:
 
                 // reset up arguments
                 transactionData = std::move(todo.data);
+                ancillaryFds = std::move(todo.ancillaryFds);
                 LOG_ALWAYS_FATAL_IF(target != todo.ref,
                                     "async list should be associated with a binder");