From 980a04afdce28a6c6159d31864967ded86815c7b Mon Sep 17 00:00:00 2001 From: Oleksiy Avramchenko Date: Mon, 14 Sep 2015 11:00:33 +0200 Subject: Fix setTorchMode support for the old HAL version CameraHardwareInterfaceFlashControl class calls disconnectCameraDevice when torch is disabled. This closes connection to the camera module, but mDevice instance is kept and variable is non-NULL which will prevent connection next time torch is going to be enabled. Change-Id: Icb1ffb07f05256afd92821f0f4908cda5332c05b --- services/camera/libcameraservice/CameraFlashlight.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'services/camera') diff --git a/services/camera/libcameraservice/CameraFlashlight.cpp b/services/camera/libcameraservice/CameraFlashlight.cpp index fd23ef9..406c1c4 100644 --- a/services/camera/libcameraservice/CameraFlashlight.cpp +++ b/services/camera/libcameraservice/CameraFlashlight.cpp @@ -882,6 +882,7 @@ status_t CameraHardwareInterfaceFlashControl::disconnectCameraDevice() { } mDevice->setPreviewWindow(NULL); mDevice->release(); + mDevice = NULL; return OK; } -- cgit v1.1