From eca1d45ba7f978a00e90dedc566578956a3d4dc9 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 7 Dec 2017 10:59:35 +0100 Subject: camera: add support for camera removal Add camera removal support to CameraProvider and CameraModule. Change-Id: I047e486d1665ba9e0b1455f77a7bbbb5e0d66653 Signed-off-by: Guennadi Liakhovetski --- camera/common/1.0/default/CameraModule.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'camera/common/1.0/default/CameraModule.cpp') diff --git a/camera/common/1.0/default/CameraModule.cpp b/camera/common/1.0/default/CameraModule.cpp index 3a4bc9c6a8..9217a823b7 100644 --- a/camera/common/1.0/default/CameraModule.cpp +++ b/camera/common/1.0/default/CameraModule.cpp @@ -425,6 +425,13 @@ status_t CameraModule::filterOpenErrorCode(status_t err) { return -ENODEV; } +void CameraModule::removeCamera(int cameraId) { + free_camera_metadata( + const_cast(mCameraInfoMap[cameraId].static_camera_characteristics)); + mCameraInfoMap.removeItem(cameraId); + mDeviceVersionMap.removeItem(cameraId); +} + uint16_t CameraModule::getModuleApiVersion() const { return mModule->common.module_api_version; } -- cgit v1.2.3