tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Camera: fix HAL1 removeCamera crash" am: 2b8f95789e am: f977c1be53 am: fe1b7f038d

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

Change-Id: I7e6164caa7a21721e182f4645ab73ac661639797
This commit is contained in:
Treehugger Robot 2020-12-04 01:36:58 +00:00 committed by Automerger Merge Worker
commit 2d23831d87
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
camera/common/1.0/default/CameraModule.cpp
View file

@ -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);
// 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());
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);
}