commit 1c9f4674ec5baac5cca2393d170dc2c8f3301265
author Victor Berchet <berchet@google.com> Thu Nov 09 07:10:34 2023 -0800
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 10 18:26:33 2023 +0000
tree 20e5697f14cfc9cda8667dcf4325af1c83787e6d
parent c921d54016f89936866854f8757090a10f4aa099

Fix the host endpoint type

Bug: 308734918
Test: Compile and execute chre_test_rpc
Change-Id: I6944fefa8eb1cc6e8d0dbbd116a7a785ab27bbc6

host/common/include/chre_host/pigweed/hal_rpc_client.h

diff --git a/host/common/include/chre_host/pigweed/hal_rpc_client.h b/host/common/include/chre_host/pigweed/hal_rpc_client.h
index f84d413..400efdb 100644
--- a/host/common/include/chre_host/pigweed/hal_rpc_client.h
+++ b/host/common/include/chre_host/pigweed/hal_rpc_client.h
@@ -58,7 +58,7 @@
    */
   static std::unique_ptr<HalRpcClient> createClient(
       std::string_view appName, SocketClient &client,
-      sp<SocketClient::ICallbacks> socketCallbacks, uint32_t hostEndpointId,
+      sp<SocketClient::ICallbacks> socketCallbacks, uint16_t hostEndpointId,
       uint64_t serverNanoappId);
 
   ~HalRpcClient() {
@@ -124,7 +124,7 @@
   };
 
   HalRpcClient(std::string_view appName, SocketClient &client,
-               uint32_t hostEndpointId, uint64_t serverNanoappId)
+               uint16_t hostEndpointId, uint64_t serverNanoappId)
       : mServerNanoappId(serverNanoappId),
         mHostEndpointId(hostEndpointId),
         mAppName(appName),
@@ -161,7 +161,7 @@
   bool retrieveServices();
 
   const uint64_t mServerNanoappId;
-  const uint32_t mHostEndpointId;
+  const uint16_t mHostEndpointId;
   const std::string mAppName;
   SocketClient &mSocketClient;
   std::unique_ptr<HalChannelOutput> mChannelOutput;

host/common/pigweed/hal_rpc_client.cc

diff --git a/host/common/pigweed/hal_rpc_client.cc b/host/common/pigweed/hal_rpc_client.cc
index 776db11..43fbe7a 100644
--- a/host/common/pigweed/hal_rpc_client.cc
+++ b/host/common/pigweed/hal_rpc_client.cc
@@ -37,7 +37,7 @@
 
 std::unique_ptr<HalRpcClient> HalRpcClient::createClient(
     std::string_view appName, SocketClient &client,
-    sp<SocketClient::ICallbacks> socketCallbacks, uint32_t hostEndpointId,
+    sp<SocketClient::ICallbacks> socketCallbacks, uint16_t hostEndpointId,
     uint64_t serverNanoappId) {
   auto rpcClient = std::unique_ptr<HalRpcClient>(
       new HalRpcClient(appName, client, hostEndpointId, serverNanoappId));