Merge "Camera: support torch control on external camera"

This commit is contained in:
Treehugger Robot
2018-08-30 19:02:26 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 3 deletions

View File

@@ -90,7 +90,7 @@ Return<void> ExternalCameraDevice::getCameraCharacteristics(
} }
Return<Status> ExternalCameraDevice::setTorchMode(TorchMode) { Return<Status> ExternalCameraDevice::setTorchMode(TorchMode) {
return Status::METHOD_NOT_SUPPORTED; return Status::OPERATION_NOT_SUPPORTED;
} }
Return<void> ExternalCameraDevice::open( Return<void> ExternalCameraDevice::open(

View File

@@ -105,8 +105,9 @@ Return<void> ExternalCameraProvider::getCameraIdList(getCameraIdList_cb _hidl_cb
Return<void> ExternalCameraProvider::isSetTorchModeSupported( Return<void> ExternalCameraProvider::isSetTorchModeSupported(
isSetTorchModeSupported_cb _hidl_cb) { isSetTorchModeSupported_cb _hidl_cb) {
// No torch mode support for USB camera // setTorchMode API is supported, though right now no external camera device
_hidl_cb (Status::OK, false); // has a flash unit.
_hidl_cb (Status::OK, true);
return Void(); return Void();
} }