diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-10-14 20:20:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-14 20:20:49 +0000 |
| commit | c7a46eb1538a3ef8d53575084d80f2f3eacd77ba (patch) | |
| tree | 522144957b12ded94ce0ca082dae1e80e40b8178 | |
| parent | ea6a3dc069809ec071290eb2c8cacef3582ead98 (diff) | |
| parent | 8a4a0ac6545f53a9ec4af6074caf0e935b08ffbe (diff) | |
| download | frameworks_av-c7a46eb1538a3ef8d53575084d80f2f3eacd77ba.zip frameworks_av-c7a46eb1538a3ef8d53575084d80f2f3eacd77ba.tar.gz frameworks_av-c7a46eb1538a3ef8d53575084d80f2f3eacd77ba.tar.bz2 | |
Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into mnc-dr-dev
| -rw-r--r-- | services/camera/libcameraservice/CameraFlashlight.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraFlashlight.cpp b/services/camera/libcameraservice/CameraFlashlight.cpp index 280bb9d..e42c596 100644 --- a/services/camera/libcameraservice/CameraFlashlight.cpp +++ b/services/camera/libcameraservice/CameraFlashlight.cpp @@ -878,6 +878,7 @@ status_t CameraHardwareInterfaceFlashControl::disconnectCameraDevice() { } mDevice->setPreviewWindow(NULL); mDevice->release(); + mDevice = NULL; return OK; } |