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

Commit 0fa3c008 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update mandatory concurrent stream docs to specify support for lower... 

Merge "Update mandatory concurrent stream docs to specify support for lower resolutions." into rvc-dev am: 83578eaa am: 8d514c97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230970

Change-Id: I7bcfdc904e81031ea122dd86adf4d323bf5abf38
parents 8abd4d53 8d514c97

core/java/android/hardware/camera2/CameraDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -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