| commit | 6188e3b11360b55092a89f41fe8008cd508b9dd3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 02 23:54:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 02 23:54:12 2022 +0000 |
| tree | b9d15f3481b0f993807d20a8a4d7b4625171f0b2 | |
| parent | ebb678225184a881a2aff589a984e28a0dcca186 [diff] | |
| parent | 5c5c78aa51a2cdcabb5afe7c63093d8ed67f8082 [diff] |
Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935 Change-Id: Ib4dbfe875294c0651890727d0c25159022bd38e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl index 57705bc..f940000 100644 --- a/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl +++ b/camera/device/aidl/android/hardware/camera/device/ICameraDevice.aidl
@@ -279,8 +279,10 @@ * with specified torchStrength if the torch is OFF. * * The torchStrength value must be within the valid range i.e. >=1 and - * <= FLASH_INFO_STRENGTH_MAXIMUM_LEVEL. Whenever the torch is turned OFF, - * the brightness level will reset to FLASH_INFO_STRENGTH_DEFAULT_LEVEL. + * <= FLASH_INFO_STRENGTH_MAXIMUM_LEVEL. The FLASH_INFO_STRENGTH_MAXIMUM_LEVEL must + * be set to a level which will not cause any burn out issues. Whenever + * the torch is turned OFF, the brightness level will reset to + * FLASH_INFO_STRENGTH_DEFAULT_LEVEL. * When the client calls setTorchMode(ON) after turnOnTorchWithStrengthLevel(N), * the flash unit will have brightness level equal to N. This level does not * represent the real brightness units. It is linear in nature i.e. flashlight