From 357e1dea20f4a8fd6e908bf3c4795c4e39838f2b Mon Sep 17 00:00:00 2001 From: Yin-Chia Yeh Date: Wed, 2 Dec 2020 14:38:19 -0800 Subject: [PATCH] Camera: fix HAL1 removeCamera crash Test: partner testing Bug: 173511749 Change-Id: Ifd5fc7c63e3835945194291d161b491bd5acb342 --- camera/common/1.0/default/CameraModule.cpp | 33 +++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 86f26e480c..27e74f1480 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -529,24 +529,29 @@ status_t CameraModule::filterOpenErrorCode(status_t err) { } void CameraModule::removeCamera(int cameraId) { - std::unordered_set physicalIds; - camera_metadata_t *metadata = const_cast( - mCameraInfoMap.valueFor(cameraId).static_camera_characteristics); - common::V1_0::helper::CameraMetadata hidlMetadata(metadata); + // 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 physicalIds; + camera_metadata_t *metadata = const_cast( + mCameraInfoMap.valueFor(cameraId).static_camera_characteristics); + common::V1_0::helper::CameraMetadata hidlMetadata(metadata); - if (isLogicalMultiCamera(hidlMetadata, &physicalIds)) { - for (const auto& id : physicalIds) { - int idInt = std::stoi(id); - if (mPhysicalCameraInfoMap.indexOfKey(idInt) >= 0) { - free_camera_metadata(mPhysicalCameraInfoMap[idInt]); - mPhysicalCameraInfoMap.removeItem(idInt); - } else { - ALOGE("%s: Cannot find corresponding static metadata for physical id %s", - __FUNCTION__, id.c_str()); + if (isLogicalMultiCamera(hidlMetadata, &physicalIds)) { + for (const auto& id : physicalIds) { + int idInt = std::stoi(id); + if (mPhysicalCameraInfoMap.indexOfKey(idInt) >= 0) { + free_camera_metadata(mPhysicalCameraInfoMap[idInt]); + mPhysicalCameraInfoMap.removeItem(idInt); + } else { + ALOGE("%s: Cannot find corresponding static metadata for physical id %s", + __FUNCTION__, id.c_str()); + } } } + free_camera_metadata(metadata); } - free_camera_metadata(metadata); + mCameraInfoMap.removeItem(cameraId); mDeviceVersionMap.removeItem(cameraId); }