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

Commit 4b0002dc authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix typos in API doc" into sc-dev am: c0a3b396 

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

Change-Id: I0ad19813b033ba6f62d7c8e843f64d3044f2f1bb
parents d553571b c0a3b396

core/java/android/hardware/camera2/MultiResolutionImageReader.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class MultiResolutionImageReader implements AutoCloseable { 
     * </p>

     * <p>

     * The {@code maxImages} parameter determines the maximum number of

     * {@link Image} objects that can be be acquired from each of the {@code ImageReader}

     * {@link Image} objects that can be acquired from each of the {@code ImageReader}

     * within the {@code MultiResolutionImageReader}. However, requesting more buffers will

     * use up more memory, so it is important to use only the minimum number necessary. The

     * application is strongly recommended to acquire no more than {@code maxImages} images

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

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public final class InputConfiguration { 
    private final boolean mIsMultiResolution;



    /**

     * Create an input configration with the width, height, and user-defined format.

     * Create an input configuration with the width, height, and user-defined format.

     *

     * <p>Images of a user-defined format are accessible by applications. Use

     * {@link android.hardware.camera2.CameraCharacteristics#SCALER_STREAM_CONFIGURATION_MAP}
@@ -64,7 +64,7 @@ public final class InputConfiguration { 
    }



    /**

     * Create an input configration with the format and a list of multi-resolution input stream

     * Create an input configuration with the format and a list of multi-resolution input stream

     * info.

     *

     * <p>Use {@link
@@ -108,7 +108,7 @@ public final class InputConfiguration { 
    }



    /**

     * Get the width of this input configration.

     * Get the width of this input configuration.

     *

     * @return width of this input configuration.

     */
@@ -117,7 +117,7 @@ public final class InputConfiguration { 
    }



    /**

     * Get the height of this input configration.

     * Get the height of this input configuration.

     *

     * @return height of this input configuration.

     */
@@ -126,7 +126,7 @@ public final class InputConfiguration { 
    }



    /**

     * Get the format of this input configration.

     * Get the format of this input configuration.

     *

     * @return format of this input configuration.

     */