Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bc7da09 authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Gerrit Code Review
Browse files

Merge "Fix AIDL major version number in DeviceInfo3 constructor"

parents b58193e3 16af6ce1

services/camera/libcameraservice/common/CameraProviderManager.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -2292,7 +2292,11 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string& 
        const CameraResourceCost& resourceCost,

        const CameraResourceCost& resourceCost,

        sp<ProviderInfo> parentProvider,

        sp<ProviderInfo> parentProvider,

        const std::vector<std::string>& publicCameraIds) :

        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) { }

                   publicCameraIds, resourceCost, parentProvider) { }





void CameraProviderManager::ProviderInfo::DeviceInfo3::notifyDeviceStateChange(int64_t newState) {

void CameraProviderManager::ProviderInfo::DeviceInfo3::notifyDeviceStateChange(int64_t newState) {