summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRucha Katakwar <ruchamk@google.com>2022-07-27 18:37:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-07-27 18:37:46 +0000
commite2fbd9ca5234d64607d80a77fc96317e8945ad9a (patch)
tree0a23e91c75a6a1f82ac874cff5f4fe07c947a69e
parentb34722397ba489c2fb9073c71204c4c672d437be (diff)
parent4be15164c17137d891e3fba20c71800e9f6e384f (diff)
downloadmedia-e2fbd9ca5234d64607d80a77fc96317e8945ad9a.tar.gz
Update torch brightness max level description. am: 4be15164c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/19385578 Change-Id: Id9c8c4ecc5ef81a8cc78bbe9eb4323b4517c3be3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--camera/docs/docs.html7
-rw-r--r--camera/docs/metadata_definitions.xml6
2 files changed, 10 insertions, 3 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index d16b73f6..343b57bf 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -12086,8 +12086,11 @@ this be power-dependent?</p>
flashlight brightness level via
<a href="https://developer.android.com/reference/android/hardware/camera2/CameraManager.html#turnOnTorchWithStrengthLevel">CameraManager#turnOnTorchWithStrengthLevel</a>.<wbr/>
If this value is equal to 1,<wbr/> flashlight brightness control is not supported.<wbr/>
-The value for this key will be null for devices with no flash unit.<wbr/>
-This level must be set to a safe value to prevent any burn out issues.<wbr/></p>
+The value for this key will be null for devices with no flash unit.<wbr/></p>
+<p>The maximum value is guaranteed to be safe to use for an indefinite duration in
+terms of device flashlight lifespan,<wbr/> but may be too bright for comfort for many
+use cases.<wbr/> Use the default torch brightness value to avoid problems with an
+over-bright flashlight.<wbr/></p>
</td>
</tr>
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 23e8bccf..469206ec 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -3769,7 +3769,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
{@link android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.
If this value is equal to 1, flashlight brightness control is not supported.
The value for this key will be null for devices with no flash unit.
- This level must be set to a safe value to prevent any burn out issues.
+
+ The maximum value is guaranteed to be safe to use for an indefinite duration in
+ terms of device flashlight lifespan, but may be too bright for comfort for many
+ use cases. Use the default torch brightness value to avoid problems with an
+ over-bright flashlight.
</details>
</entry>
<entry name="strengthDefaultLevel" type="int32" visibility="public" hal_version="3.8">