| commit | 8fd024c378fd81875e5371d4732dc58aa112f538 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 30 12:20:58 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 30 12:20:58 2018 -0700 |
| tree | 33c48170a31001486d86d23ff4c8c6b4d7e9c3b0 | |
| parent | f9f9f7cf085396cd32b955c0e04dad5ab29a119c [diff] | |
| parent | fb5d713264fd2409994ac893aa96c8728e579d56 [diff] |
Merge "Camera: support torch control on external camera" am: f8007c2000 am: 361f2f9a17 am: fb5d713264 Change-Id: I5dbe1e94b8e6a49a57770717ff6f7c3702e6bb1c
diff --git a/camera/device/3.4/default/ExternalCameraDevice.cpp b/camera/device/3.4/default/ExternalCameraDevice.cpp index e093822..e7361dd 100644 --- a/camera/device/3.4/default/ExternalCameraDevice.cpp +++ b/camera/device/3.4/default/ExternalCameraDevice.cpp
@@ -90,7 +90,7 @@ } Return<Status> ExternalCameraDevice::setTorchMode(TorchMode) { - return Status::METHOD_NOT_SUPPORTED; + return Status::OPERATION_NOT_SUPPORTED; } Return<void> ExternalCameraDevice::open(
diff --git a/camera/provider/2.4/default/ExternalCameraProvider.cpp b/camera/provider/2.4/default/ExternalCameraProvider.cpp index a4046d0..1cec0e5 100644 --- a/camera/provider/2.4/default/ExternalCameraProvider.cpp +++ b/camera/provider/2.4/default/ExternalCameraProvider.cpp
@@ -105,8 +105,9 @@ Return<void> ExternalCameraProvider::isSetTorchModeSupported( isSetTorchModeSupported_cb _hidl_cb) { - // No torch mode support for USB camera - _hidl_cb (Status::OK, false); + // setTorchMode API is supported, though right now no external camera device + // has a flash unit. + _hidl_cb (Status::OK, true); return Void(); }