diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-03 20:15:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 20:15:24 +0000 |
| commit | f977c1be531c182e301b5537b23a012092b7b117 (patch) | |
| tree | 6bf337abc6b771a9cdf1e8aacf4bbe1ac895cca1 /camera/common/1.0/default/CameraModule.cpp | |
| parent | e9fa46f49f59eca9a80088aa1cdad632bba753cb (diff) | |
| parent | 2b8f95789e33ff500bde77d32773e956cf37ec50 (diff) | |
Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1515921
Change-Id: I687e22222e2228a91b0364efae51277cf6cd9c4a
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); } |