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

Commit 27b8b0b3 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Avoid using an uninitialized physical camera id" into qt-dev 

am: b9020958

Change-Id: Iba750ee8a496d59319c6d545c01693409fad3297
parents 32ef6882 b9020958

camera/device/3.4/default/CameraDeviceSession.cpp

+5 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ bool CameraDeviceSession::preProcessConfigurationLocked_3_4( 
            mPhysicalCameraIdMap[id] = requestedConfiguration.streams[i].physicalCameraId;

            mStreamMap[id].data_space = mapToLegacyDataspace(

                    mStreamMap[id].data_space);

            mStreamMap[id].physical_camera_id = mPhysicalCameraIdMap[id].c_str();

            mCirculatingBuffers.emplace(stream.mId, CirculatingBuffers{});

        } else {

            // width/height/format must not change, but usage/rotation might need to change
@@ -206,6 +205,11 @@ bool CameraDeviceSession::preProcessConfigurationLocked_3_4( 
            mStreamMap[id].rotation = (int) requestedConfiguration.streams[i].v3_2.rotation;

            mStreamMap[id].usage = (uint32_t) requestedConfiguration.streams[i].v3_2.usage;

        }

        // It is possible for the entry in 'mStreamMap' to get initialized by an older

        // HIDL API. Make sure that the physical id is always initialized when using

        // a more recent API call.

        mStreamMap[id].physical_camera_id = mPhysicalCameraIdMap[id].c_str();



        (*streams)[i] = &mStreamMap[id];

    }