| commit | 6a38ecb0cfe4057da7e2a28a94a623ba3ee27de0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Aug 03 00:19:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 03 00:19:17 2022 +0000 |
| tree | de0b877887b734dc038b62ae641d54fb6ac3b312 | |
| parent | 1482630439e4da560c6957cd245247a39e2dfeed [diff] | |
| parent | b4027e5f422f47085ca261214908a465a6dfb9ad [diff] |
Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51 am: b4027e5f42 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19345935 Change-Id: I58e92a5204ea509d713c6c4fd23e8e1d463366d4 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