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

Commit d4ee608d authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android Build Coastguard Worker
Browse files

Camera: Fix broken doc link 

Test: m -j ds-docs-java and grep for ERROR
Flag: DOCS_ONLY
Bug: 343427984
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b15f3351b539e4639d60a79b3d28214d72d1c316)
Merged-In: I57697352146b68c5c63ae7510e7ecea62bb1e0ca
Change-Id: I57697352146b68c5c63ae7510e7ecea62bb1e0ca
parent 7559e35d

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

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri 
     * {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, then this list will only contain

     * CONTROL_ZOOM_RATIO_RANGE and SCALER_AVAILABLE_MAX_DIGITAL_ZOOM

     *

     * @see INFO_SESSION_CONFIGURATION_QUERY_VERSION

     * @see #INFO_SESSION_CONFIGURATION_QUERY_VERSION

     */

    @NonNull

    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)

core/java/android/hardware/camera2/CaptureRequest.java

+6 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ import java.util.Set; 
 *

 * <p>CaptureRequests can be created by using a {@link Builder} instance,

 * obtained by calling {@link CameraDevice#createCaptureRequest} or {@link

 * CameraManager#createCaptureRequest}</p>

 * CameraDevice.CameraDeviceSetup#createCaptureRequest}</p>

 *

 * <p>CaptureRequests are given to {@link CameraCaptureSession#capture} or

 * {@link CameraCaptureSession#setRepeatingRequest} to capture images from a camera.</p>
@@ -84,7 +84,7 @@ import java.util.Set; 
 * @see CameraCaptureSession#setRepeatingBurst

 * @see CameraDevice#createCaptureRequest

 * @see CameraDevice#createReprocessCaptureRequest

 * @see CameraManager#createCaptureRequest

 * @see CameraDevice.CameraDeviceSetup#createCaptureRequest

 */

public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>

        implements Parcelable {
@@ -812,8 +812,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * A builder for capture requests.

     *

     * <p>To obtain a builder instance, use the

     * {@link CameraDevice#createCaptureRequest} or {@link CameraManager#createCaptureRequest}

     * method, which initializes the request fields to one of the templates defined in

     * {@link CameraDevice#createCaptureRequest} or

     * {@link CameraDevice.CameraDeviceSetup#createCaptureRequest} method, which

     * initializes the request fields to one of the templates defined in

     * {@link CameraDevice}.

     *

     * @see CameraDevice#createCaptureRequest
@@ -822,7 +823,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * @see CameraDevice#TEMPLATE_STILL_CAPTURE

     * @see CameraDevice#TEMPLATE_VIDEO_SNAPSHOT

     * @see CameraDevice#TEMPLATE_MANUAL

     * @see CameraManager#createCaptureRequest

     * @see CameraDevice.CameraDeviceSetup#createCaptureRequest

     */

    public final static class Builder {

core/java/android/hardware/camera2/params/ExtensionSessionConfiguration.java

+3 −2
Original line number Diff line number Diff line
@@ -23,12 +23,13 @@ import android.graphics.ColorSpace; 
import android.hardware.camera2.CameraCharacteristics;

import android.hardware.camera2.CameraExtensionCharacteristics.Extension;

import android.hardware.camera2.CameraExtensionSession;

import android.media.ImageReader;



import com.android.internal.camera.flags.Flags;



import java.util.List;

import java.util.concurrent.Executor;



import com.android.internal.camera.flags.Flags;



/**

 * A class that aggregates all supported arguments for

 * {@link CameraExtensionSession} initialization.

core/java/android/hardware/camera2/params/MandatoryStreamCombination.java

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ public final class MandatoryStreamCombination { 
         * smaller sizes, then the resulting

         * {@link android.hardware.camera2.params.SessionConfiguration session configuration} can

         * be tested either by calling {@link CameraDevice#createCaptureSession} or

         * {@link CameraDeviceSetup#isSessionConfigurationSupported}.

         * {@link CameraDevice.CameraDeviceSetup#isSessionConfigurationSupported}.

         *

         * @return non-modifiable ascending list of available sizes.

         */

core/java/android/hardware/camera2/params/SessionConfiguration.java

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ public final class SessionConfiguration implements Parcelable { 
     * Create a new {@link SessionConfiguration} with sessionType and output configurations.

     *

     * <p>The SessionConfiguration objects created by this constructor can be used by

     * {@link CameraDeviceSetup.isSessionConfigurationSupported} and {@link

     * CameraDeviceSetup.getSessionCharacteristics} to query a camera device's feature

     * {@link CameraDeviceSetup#isSessionConfigurationSupported} and {@link

     * CameraDeviceSetup#getSessionCharacteristics} to query a camera device's feature

     * combination support and session specific characteristics. For the SessionConfiguration

     * object to be used to create a capture session, {@link #setStateCallback} must be called to

     * specify the state callback function, and any incomplete OutputConfigurations must be