aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:25:58 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-12-13 00:25:58 +0000
commit35540e1e17fbb379ed445dd7b030b81ed55fb6be (patch)
tree89de8fe9a7175e73c60a0e8ad2405372cca62826
parent60783fa804a7a25fce27fe57f4f68eae3785b693 (diff)
parent110ee3a40a41d40e60303e951d36ebbb35d727ca (diff)
downloadchre-35540e1e17fbb379ed445dd7b030b81ed55fb6be.tar.gz
Snap for 11211173 from 110ee3a40a41d40e60303e951d36ebbb35d727ca to 24Q1-release
Change-Id: Icfffc5ee5f745deddcc567637d79b2bded7dcbf9
-rw-r--r--host/hal_generic/common/hal_client_manager.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/host/hal_generic/common/hal_client_manager.cc b/host/hal_generic/common/hal_client_manager.cc
index 4947843b..da114044 100644
--- a/host/hal_generic/common/hal_client_manager.cc
+++ b/host/hal_generic/common/hal_client_manager.cc
@@ -53,6 +53,13 @@ std::string getUuid(const std::shared_ptr<IContextHubCallback> &callback) {
}
return oStringStream.str();
}
+
+bool isCallbackV3Enabled(const std::shared_ptr<IContextHubCallback> &callback) {
+ int32_t callbackVersion;
+ callback->getInterfaceVersion(&callbackVersion);
+ return callbackVersion >= 3 && context_hub_callback_uuid_enabled();
+}
+
} // namespace
HalClient *HalClientManager::getClientByField(
@@ -169,7 +176,7 @@ bool HalClientManager::registerCallback(
}
std::string uuid;
- if (context_hub_callback_uuid_enabled()) {
+ if (isCallbackV3Enabled(callback)) {
uuid = getUuid(callback);
} else {
uuid = getUuidLocked();