summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jayant Chowdhary <jchowdhary@google.com> 2020-07-24 17:11:57 -0700
committer Jayant Chowdhary <jchowdhary@google.com> 2020-07-27 17:18:12 -0700
commitd537ce04fb9abba855e19d393d343165ea09ffbe (patch)
tree13d997cbe27a5dc8018896056ea33330429ec914
parentd7feae01a53e35fc1eb5e2a7cf3582a5fa44efed (diff)
Update mandatory concurrent stream docs to specify support for lower resolutions.
Bug: 162110784 Test: make doc-comment-check-docs Change-Id: I8a2677df320f8f496b185fd80234f04dd9eed97f Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
-rw-r--r--core/java/android/hardware/camera2/CameraDevice.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraDevice.java b/core/java/android/hardware/camera2/CameraDevice.java
index 15625cdeb8f4..decf05396c1f 100644
--- a/core/java/android/hardware/camera2/CameraDevice.java
+++ b/core/java/android/hardware/camera2/CameraDevice.java
@@ -683,6 +683,8 @@ public abstract class CameraDevice implements AutoCloseable {
*<p>BACKWARD_COMPATIBLE devices capable of streaming concurrently with other devices as described by
* {@link android.hardware.camera2.CameraManager#getConcurrentCameraIds} have the
* following guaranteed streams (when streaming concurrently with other devices)</p>
+ * <p> Note: The sizes mentioned for these concurrent streams are the maximum sizes guaranteed
+ * to be supported. Sizes smaller than these, obtained by {@link StreamConfigurationMap#getOutputSizes} for a particular format, are supported as well. </p>
*
* <table>
* <tr><th colspan="5">Concurrent stream guaranteed configurations</th></tr>
@@ -696,7 +698,7 @@ public abstract class CameraDevice implements AutoCloseable {
* </table><br>
* </p>
*
- * <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation.
+ * <p> Devices which are not backwards-compatible, support a mandatory single stream of size sVGA with image format {@code DEPTH16} during concurrent operation. </p>
*
* <p> For guaranteed concurrent stream configurations:</p>
* <p> sVGA refers to the camera device's maximum resolution for that format from {@link StreamConfigurationMap#getOutputSizes} or