Commit f339beaf authored Oct 14, 2015 by Chien-Yu Chen Committed by Android Git Automerger Oct 14, 2015

am 2e1683c4: Merge "Fix setTorchMode support for the old HAL version"

* commit '2e1683c4':
  Fix setTorchMode support for the old HAL version

services/camera/libcameraservice/CameraFlashlight.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -878,6 +878,7 @@ status_t CameraHardwareInterfaceFlashControl::disconnectCameraDevice() {
		}
		mDevice->setPreviewWindow(NULL);
		mDevice->release();
		mDevice = NULL;

		return OK;
		}