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

Commit d4b8d217 authored by Shik Chen's avatar Shik Chen
Browse files

Camera: Fix a crash in removeCamera() 

mCameraInfoMap is a KeyedVector, we should use .valueFor() instead of
operator[] to get the value from a key.

Bug: 118364955
Bug: 118359878
Bug: 77833131
Test: Plug and unplug the external camera 10+ times.
Change-Id: Ibf48e5a78b16bdeba08b02242379eaf571fc76cb
parent b106b5c8

camera/common/1.0/default/CameraModule.cpp

+2 −2
Original line number Diff line number Diff line
@@ -466,8 +466,8 @@ status_t CameraModule::filterOpenErrorCode(status_t err) { 
}



void CameraModule::removeCamera(int cameraId) {

    free_camera_metadata(

        const_cast<camera_metadata_t*>(mCameraInfoMap[cameraId].static_camera_characteristics));

    free_camera_metadata(const_cast<camera_metadata_t*>(

        mCameraInfoMap.valueFor(cameraId).static_camera_characteristics));

    mCameraInfoMap.removeItem(cameraId);

    mDeviceVersionMap.removeItem(cameraId);

}