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

Commit fe1b7f03 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f9578 am: f977c1be 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515921

Change-Id: I65c8700ae439a802cf6c119e15de20a290cfba9e
parents a0bb7491 f977c1be

camera/common/1.0/default/CameraModule.cpp

+20 −15
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ status_t CameraModule::filterOpenErrorCode(status_t err) { 
}



void CameraModule::removeCamera(int cameraId) {

    // Skip HAL1 devices which isn't cached in mCameraInfoMap and don't advertise

    // static_camera_characteristics

    if (getDeviceVersion(cameraId) >= CAMERA_DEVICE_API_VERSION_3_0) {

        std::unordered_set<std::string> physicalIds;

        camera_metadata_t *metadata = const_cast<camera_metadata_t*>(

                mCameraInfoMap.valueFor(cameraId).static_camera_characteristics);
@@ -547,6 +550,8 @@ void CameraModule::removeCamera(int cameraId) { 
            }

        }

        free_camera_metadata(metadata);

    }



    mCameraInfoMap.removeItem(cameraId);

    mDeviceVersionMap.removeItem(cameraId);

}