Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Camera: support torch control on external camera" am: f8007c2000 am: 361f2f9a17

Browse Source 
am: fb5d713264

Change-Id: I5dbe1e94b8e6a49a57770717ff6f7c3702e6bb1c
This commit is contained in:
Yin-Chia Yeh
2018-08-30 12:20:58 -07:00
committed by android-build-merger
parent f9f9f7cf08 fb5d713264
commit 8fd024c378
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
camera/device/3.4/default/ExternalCameraDevice.cpp
View File

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

5
camera/provider/2.4/default/ExternalCameraProvider.cpp
View File

@@ -105,8 +105,9 @@ Return<void> ExternalCameraProvider::getCameraIdList(getCameraIdList_cb _hidl_cb
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();
}