diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-04 01:36:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-04 01:36:58 +0000 |
| commit | 2d23831d8733e42875222c0e96983ecd43597a50 (patch) | |
| tree | 540f750917e773c357fdddb76d31b59d49e61088 /camera/common/1.0/default/CameraModule.cpp | |
| parent | 77c9e6c183204fdf9fdd2b1d3fe87501cd74d207 (diff) | |
| parent | fe1b7f038d70d17f73841bd2ab40d609dd20968a (diff) | |
Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e am: f977c1be53 am: fe1b7f038d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515921
Change-Id: I7e6164caa7a21721e182f4645ab73ac661639797
Diffstat (limited to 'camera/common/1.0/default/CameraModule.cpp')
| -rw-r--r-- | camera/common/1.0/default/CameraModule.cpp | 35 |
1 files changed, 20 insertions, 15 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<std::string> physicalIds; - camera_metadata_t *metadata = const_cast<camera_metadata_t*>( - 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()); + // 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); + 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()); + } } } + free_camera_metadata(metadata); } - free_camera_metadata(metadata); + mCameraInfoMap.removeItem(cameraId); mDeviceVersionMap.removeItem(cameraId); } |