Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 361f2f9a authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: support torch control on external camera" 

am: f8007c20

Change-Id: I876d92c646f3c0cb189dfd6be4881f4706d991cf
parents 7e0abbc7 f8007c20

camera/device/3.4/default/ExternalCameraDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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(

camera/provider/2.4/default/ExternalCameraProvider.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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();

}