commit dfedcf7deb17a28271740d1892e89c5f5bd48664
author Steven Moreland <smoreland@google.com> Thu Mar 02 20:46:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 02 20:46:15 2023 +0000
tree d1b76641c2b0003c23cdfdcf5fbb00aebe720c46
parent 43b860bc842abccd5fca3b4ef5de3faaad8337c2
parent 16b3bc96d65c9793c5540b9a5e7bdf191912860e

Merge "sed setMaxOutgoing{Threads,Connections}"

javalib/jni/android_system_virtualmachine_VirtualizationService.cpp

diff --git a/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp b/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
index bd80880..6659a57 100644
--- a/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
+++ b/javalib/jni/android_system_virtualmachine_VirtualizationService.cpp
@@ -83,7 +83,7 @@
     ARpcSession_setFileDescriptorTransportMode(session.get(),
                                                ARpcSession_FileDescriptorTransportMode::Unix);
     ARpcSession_setMaxIncomingThreads(session.get(), VIRTMGR_THREADS);
-    ARpcSession_setMaxOutgoingThreads(session.get(), VIRTMGR_THREADS);
+    ARpcSession_setMaxOutgoingConnections(session.get(), VIRTMGR_THREADS);
     // SAFETY - ARpcSession_setupUnixDomainBootstrapClient does not take ownership of clientFd.
     auto client = ARpcSession_setupUnixDomainBootstrapClient(session.get(), clientFd);
     return AIBinder_toJavaBinder(env, client);

vmclient/src/lib.rs

diff --git a/vmclient/src/lib.rs b/vmclient/src/lib.rs
index 0e3d140..77ddf05 100644
--- a/vmclient/src/lib.rs
+++ b/vmclient/src/lib.rs
@@ -122,7 +122,7 @@
         let session = RpcSession::new();
         session.set_file_descriptor_transport_mode(FileDescriptorTransportMode::Unix);
         session.set_max_incoming_threads(VIRTMGR_THREADS);
-        session.set_max_outgoing_threads(VIRTMGR_THREADS);
+        session.set_max_outgoing_connections(VIRTMGR_THREADS);
         session
             .setup_unix_domain_bootstrap_client(self.client_fd.as_fd())
             .map_err(|_| io::Error::from(io::ErrorKind::ConnectionRefused))