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

Commit 5fae43f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "camera2: Fix doc link for... 

Merge "camera2: Fix doc link for CameraCaptureSession.StateCallback.onSurfacePrepared." am: 5f4f0956 am: 1a37b41f am: bcddc50a

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



Change-Id: Iac9ae43e9998eb2db6e4b2daa5d73a9fcab6d096
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 744f25d3 bcddc50a

core/java/android/hardware/camera2/CameraCaptureSession.java

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public abstract class CameraCaptureSession implements AutoCloseable { 
     *

     * <p>Note that if 2 surfaces share the same stream via {@link

     * OutputConfiguration#enableSurfaceSharing} and {@link OutputConfiguration#addSurface},

     * prepare() only needs to be called on one surface, and {link

     * prepare() only needs to be called on one surface, and {@link

     * StateCallback#onSurfacePrepared} will be triggered for both surfaces.</p>

     *

     * <p>{@link android.hardware.camera2.CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}