commit 16af6ce1dd84e922f1e12eb751a534cea603b039
author Jayant Chowdhary <jchowdhary@google.com> Thu May 04 10:36:31 2023 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Thu May 04 17:39:25 2023 +0000
tree d29d72fec368d321f4695de1da7cefdd2199c064
parent ae14fcc6031f647d5ce79ccd7fdd935128117e10

Fix AIDL major version number in DeviceInfo3 constructor

Bug: 259369863

Test: GCA front and back cameras used on device

Change-Id: If877d2fed862a408365dfd2e7d21dcf197431565
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index cd23250..f93eb89 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2306,7 +2306,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) {