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

Commit 646afca4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "camera2: Fix getConcurrentCameraIds doc formatting" am: 282a29b8 am:... 

Merge "camera2: Fix getConcurrentCameraIds doc formatting" am: 282a29b8 am: c1a873af am: b85edb9e

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



Change-Id: I6314cda293fe47d3977085340a2c2b340c79e30e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f67af97 b85edb9e

core/java/android/hardware/camera2/CameraManager.java

+7 −5
Original line number Diff line number Diff line
@@ -245,11 +245,13 @@ public final class CameraManager { 
     * applications is not guaranteed to be supported, however.</p>

     *

     * <p>For concurrent operation, in chronological order :

     * - Applications must first close any open cameras that have sessions configured, using

     *   {@link CameraDevice#close}.

     * - All camera devices intended to be operated concurrently, must be opened using

     *   {@link #openCamera}, before configuring sessions on any of the camera devices.</p>

     *

     * <ul>

     * <li> Applications must first close any open cameras that have sessions configured, using

     *   {@link CameraDevice#close}. </li>

     * <li> All camera devices intended to be operated concurrently, must be opened using

     *   {@link #openCamera}, before configuring sessions on any of the camera devices.</li>

     *</ul>

     *</p>

     * <p>Each device in a combination, is guaranteed to support stream combinations which may be

     * obtained by querying {@link #getCameraCharacteristics} for the key

     * {@link android.hardware.camera2.CameraCharacteristics#SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS}.</p>