| From 8585c0c495abb6b1c8eb7d064cee7f004278d595 Mon Sep 17 00:00:00 2001 |
| From: Pierre-Hugues Husson <phh@phh.me> |
| Date: Sun, 19 Aug 2018 23:05:26 +0200 |
| Subject: [PATCH 3/5] We might not have a mFlashlight at this state, but that's |
| ok |
| |
| --- |
| services/camera/libcameraservice/CameraService.cpp | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp |
| index ba69bddaf..607e2d23b 100644 |
| --- a/services/camera/libcameraservice/CameraService.cpp |
| +++ b/services/camera/libcameraservice/CameraService.cpp |
| @@ -258,7 +258,7 @@ void CameraService::addStates(const String8 id) { |
| conflicting)); |
| } |
| |
| - if (mFlashlight->hasFlashUnit(id)) { |
| + if (mFlashlight != nullptr && mFlashlight->hasFlashUnit(id)) { |
| Mutex::Autolock al(mTorchStatusMutex); |
| mTorchStatusMap.add(id, TorchModeStatus::AVAILABLE_OFF); |
| } |
| -- |
| 2.21.0 |
| |