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

Commit fd23a17f authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "Fix AIDL major version number in DeviceInfo3 constructor" am: 7bc7da09 am: 14177522 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2580090



Change-Id: Ib5cb9be5f21bd8bc433750be4556e270bfbeaf07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2ed7557d 14177522

services/camera/libcameraservice/common/CameraProviderManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2292,7 +2292,11 @@ CameraProviderManager::ProviderInfo::DeviceInfo3::DeviceInfo3(const std::string& 
        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) {