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

Commit 331e1541 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "camera2: Fix docs for mandatory stream combinations." am: b13fbc15... 

Merge "camera2: Fix docs for mandatory stream combinations." am: b13fbc15 am: 451ce2d7 am: d4c4240a

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



Change-Id: I0150d4313556fd0adc1d66d299029972982eea70
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd0764ee d4c4240a

core/java/android/hardware/camera2/CameraCharacteristics.java

+2 −2
Original line number Diff line number Diff line
@@ -3635,7 +3635,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * <p>An array of mandatory stream combinations which are applicable when device support the

     * 10-bit output capability

     * {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT }

     * This is an app-readable conversion of the maximum resolution mandatory stream combination

     * This is an app-readable conversion of the 10 bit output mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is
@@ -3660,7 +3660,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
    /**

     * <p>An array of mandatory stream combinations which are applicable when device lists

     * {@code PREVIEW_STABILIZATION} in {@link CameraCharacteristics#CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES android.control.availableVideoStabilizationModes}.

     * This is an app-readable conversion of the maximum resolution mandatory stream combination

     * This is an app-readable conversion of the preview stabilization mandatory stream combination

     * {@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.</p>

     * <p>The array of

     * {@link android.hardware.camera2.params.MandatoryStreamCombination combinations} is