commit 7bc7da0902f09bc4e0a1d908c89f55aeffe6b341
author Jayant Chowdhary <jchowdhary@google.com> Tue May 23 21:58:50 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 21:58:50 2023 +0000
tree da53236099596810f4cc1f9b7d30fab3a7e488e2
parent b58193e3c5ad2977fec8ccd42cf28b646f4406cf
parent 16af6ce1dd84e922f1e12eb751a534cea603b039

Merge "Fix AIDL major version number in DeviceInfo3 constructor"

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index c72986d..4259efd 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2292,7 +2292,11 @@
         const CameraResourceCost& resourceCost,
         sp<ProviderInfo> parentProvider,
         const std::vector<std::string>& publicCameraIds) :
-        DeviceInfo(name, tagId, id, hardware::hidl_version{3, minorVersion},
+        DeviceInfo(name, tagId, id,
+                   hardware::hidl_version{
+                        static_cast<uint16_t >(
+                                parentProvider->getIPCTransport() == IPCTransport::HIDL ? 3 : 1),
+                                minorVersion},
                    publicCameraIds, resourceCost, parentProvider) { }
 
 void CameraProviderManager::ProviderInfo::DeviceInfo3::notifyDeviceStateChange(int64_t newState) {