Commit 682abf40 authored Feb 25, 2021 by Jasmine Chen

Camera: Fix double-free in removeCamera

When a camera is removed, |hidlMetadata| takes over ownership of
|metadata|. Therefore, we should not free |metadata| again.

Bug: 180014486
Test: Remove an external camera, and no crashes were observed.
Change-Id: I85246067f8753911cbcb58af24a46f12962226f3
(cherry picked from commit f36a439e3a97315a9f0a8661ea77aff61fb79c82)

parent 688c8846

camera/common/1.0/default/CameraModule.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -549,7 +549,6 @@ void CameraModule::removeCamera(int cameraId) {
		}
		}
		}
		free_camera_metadata(metadata);
		}

		mCameraInfoMap.removeItem(cameraId);