| commit | 361f2f9a176bb696a8ab2f9f9999e1727508feb4 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 30 12:11:29 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 30 12:11:29 2018 -0700 |
| tree | f5175b4d96c8e539c9ad9a36ca147b1ce838c901 | |
| parent | 7e0abbc7d8fa62d91389504d2df3474a98a0f5cf [diff] | |
| parent | f8007c20003eb3f76a037dd2657f14c22b527e85 [diff] |
Merge "Camera: support torch control on external camera" am: f8007c2000 Change-Id: I876d92c646f3c0cb189dfd6be4881f4706d991cf
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(); }