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

Commit 00336bac authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "camera2 docs: fix CONTROL_AWB_MODE documentation."

parents 1f31bfad 30f6a80e

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

+1 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * transform fields, and what its illumination target

     * is.</p>

     * <p>This control is only effective if {@link CaptureRequest#CONTROL_MODE android.control.mode} is AUTO.</p>

     * <p>When set to the ON mode, the camera device's auto-white balance

     * <p>When set to the AUTO mode, the camera device's auto-white balance

     * routine is enabled, overriding the application's selected

     * {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} and

     * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}. Note that when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode}

core/java/android/hardware/camera2/CaptureResult.java

+1 −1
Original line number Diff line number Diff line
@@ -1781,7 +1781,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * transform fields, and what its illumination target

     * is.</p>

     * <p>This control is only effective if {@link CaptureRequest#CONTROL_MODE android.control.mode} is AUTO.</p>

     * <p>When set to the ON mode, the camera device's auto-white balance

     * <p>When set to the AUTO mode, the camera device's auto-white balance

     * routine is enabled, overriding the application's selected

     * {@link CaptureRequest#COLOR_CORRECTION_TRANSFORM android.colorCorrection.transform}, {@link CaptureRequest#COLOR_CORRECTION_GAINS android.colorCorrection.gains} and

     * {@link CaptureRequest#COLOR_CORRECTION_MODE android.colorCorrection.mode}. Note that when {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode}