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

Commit 14177522 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 

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



Change-Id: Ie70f4ec7707578d81bfc8e37fda58e81b4a4e7cf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1adfc0be 7bc7da09

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