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

Commit b1a836b9 authored by Zhijun He's avatar Zhijun He Committed by Android Git Automerger
Browse files

am 99dc8996: Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev 

* commit '99dc8996':
  Camera2: get ride of sceneModeOverrides in API doc
parents f6f170a1 99dc8996

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

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * android.control.* are mostly disabled, and the camera device implements

     * one of the scene mode settings (such as ACTION, SUNSET, or PARTY)

     * as it wishes. The camera device scene mode 3A settings are provided by

     * android.control.sceneModeOverrides.</p>

     * {@link android.hardware.camera2.CaptureResult capture results}.</p>

     * <p>When set to OFF_KEEP_STATE, it is similar to OFF mode, the only difference

     * is that this frame will not be used by camera device background 3A statistics

     * update, as if this frame is never captured. This mode can be used in the scenario

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

+1 −1
Original line number Diff line number Diff line
@@ -1921,7 +1921,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * android.control.* are mostly disabled, and the camera device implements

     * one of the scene mode settings (such as ACTION, SUNSET, or PARTY)

     * as it wishes. The camera device scene mode 3A settings are provided by

     * android.control.sceneModeOverrides.</p>

     * {@link android.hardware.camera2.CaptureResult capture results}.</p>

     * <p>When set to OFF_KEEP_STATE, it is similar to OFF mode, the only difference

     * is that this frame will not be used by camera device background 3A statistics

     * update, as if this frame is never captured. This mode can be used in the scenario