am fc7b5a4a: am a04159ac: libcameraservice: Fix ALOG prints in FlashLight. am: 32ab9fdab5 (2d3e2892) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/CameraFlashlight.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -99,7 +99,8 @@ status_t CameraFlashlight::createFlashlightControl(const String8& cameraId) {

		status_t CameraFlashlight::setTorchMode(const String8& cameraId, bool enabled) {
		if (!mFlashlightMapInitialized) {
		ALOGE("%s: findFlashUnits() must be called before this method.");
		ALOGE("%s: findFlashUnits() must be called before this method.",
		__FUNCTION__);
		return NO_INIT;
		}

		@@ -200,7 +201,8 @@ bool CameraFlashlight::hasFlashUnit(const String8& cameraId) {

		bool CameraFlashlight::hasFlashUnitLocked(const String8& cameraId) {
		if (!mFlashlightMapInitialized) {
		ALOGE("%s: findFlashUnits() must be called before this method.");
		ALOGE("%s: findFlashUnits() must be called before this method.",
		__FUNCTION__);
		return false;
		}

		@@ -219,7 +221,8 @@ status_t CameraFlashlight::prepareDeviceOpen(const String8& cameraId) {

		Mutex::Autolock l(mLock);
		if (!mFlashlightMapInitialized) {
		ALOGE("%s: findFlashUnits() must be called before this method.");
		ALOGE("%s: findFlashUnits() must be called before this method.",
		__FUNCTION__);
		return NO_INIT;
		}

		@@ -256,7 +259,8 @@ status_t CameraFlashlight::deviceClosed(const String8& cameraId) {

		Mutex::Autolock l(mLock);
		if (!mFlashlightMapInitialized) {
		ALOGE("%s: findFlashUnits() must be called before this method.");
		ALOGE("%s: findFlashUnits() must be called before this method.",
		__FUNCTION__);
		return NO_INIT;
		}