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

Commit 8fd024c3 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 am: 361f2f9a 

am: fb5d7132

Change-Id: I5dbe1e94b8e6a49a57770717ff6f7c3702e6bb1c
parents f9f9f7cf fb5d7132

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();

}