diff options
author | Treehugger Robot | 2018-08-30 14:02:26 -0500 |
---|---|---|
committer | Gerrit Code Review | 2018-08-30 14:02:26 -0500 |
commit | f8007c20003eb3f76a037dd2657f14c22b527e85 (patch) | |
tree | 0da59daa97d2f421d0db79475f6894559d96d6b4 | |
parent | 81221c2f6cccd1aa7b46e5a12bbcbeadcd58d3b6 (diff) | |
parent | bbc046ed672cfc230c787b31d7a793292a16f476 (diff) | |
download | platform-hardware-interfaces-f8007c20003eb3f76a037dd2657f14c22b527e85.tar.gz platform-hardware-interfaces-f8007c20003eb3f76a037dd2657f14c22b527e85.tar.xz platform-hardware-interfaces-f8007c20003eb3f76a037dd2657f14c22b527e85.zip |
Merge "Camera: support torch control on external camera"
-rw-r--r-- | camera/device/3.4/default/ExternalCameraDevice.cpp | 2 | ||||
-rw-r--r-- | camera/provider/2.4/default/ExternalCameraProvider.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/camera/device/3.4/default/ExternalCameraDevice.cpp b/camera/device/3.4/default/ExternalCameraDevice.cpp index e093822a..e7361dd4 100644 --- a/camera/device/3.4/default/ExternalCameraDevice.cpp +++ b/camera/device/3.4/default/ExternalCameraDevice.cpp | |||
@@ -90,7 +90,7 @@ Return<void> ExternalCameraDevice::getCameraCharacteristics( | |||
90 | } | 90 | } |
91 | 91 | ||
92 | Return<Status> ExternalCameraDevice::setTorchMode(TorchMode) { | 92 | Return<Status> ExternalCameraDevice::setTorchMode(TorchMode) { |
93 | return Status::METHOD_NOT_SUPPORTED; | 93 | return Status::OPERATION_NOT_SUPPORTED; |
94 | } | 94 | } |
95 | 95 | ||
96 | Return<void> ExternalCameraDevice::open( | 96 | Return<void> ExternalCameraDevice::open( |
diff --git a/camera/provider/2.4/default/ExternalCameraProvider.cpp b/camera/provider/2.4/default/ExternalCameraProvider.cpp index a4046d09..1cec0e5d 100644 --- a/camera/provider/2.4/default/ExternalCameraProvider.cpp +++ b/camera/provider/2.4/default/ExternalCameraProvider.cpp | |||
@@ -105,8 +105,9 @@ Return<void> ExternalCameraProvider::getCameraIdList(getCameraIdList_cb _hidl_cb | |||
105 | 105 | ||
106 | Return<void> ExternalCameraProvider::isSetTorchModeSupported( | 106 | Return<void> ExternalCameraProvider::isSetTorchModeSupported( |
107 | isSetTorchModeSupported_cb _hidl_cb) { | 107 | isSetTorchModeSupported_cb _hidl_cb) { |
108 | // No torch mode support for USB camera | 108 | // setTorchMode API is supported, though right now no external camera device |
109 | _hidl_cb (Status::OK, false); | 109 | // has a flash unit. |
110 | _hidl_cb (Status::OK, true); | ||
110 | return Void(); | 111 | return Void(); |
111 | } | 112 | } |
112 | 113 | ||