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

Commit b8561382 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7012656 from 25f8e687 to rvc-qpr2-release 

Change-Id: I7e7dcc5d5722e80ce8ad3b1cfd9c5bca7b3f7557
parents b352e821 25f8e687

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

}