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

Commit 112a8a34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[DOC UPDATE] Refine extension strength default" into udc-dev am: 79e749d4 

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



Change-Id: Ie053fba40201838a14f477dde5f59d499c342a53
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4495eb59 79e749d4

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

+5 −4
Original line number Diff line number Diff line
@@ -4194,9 +4194,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p>This control allows Camera extension clients to configure the strength of the applied

     * extension effect. Strength equal to 0 means that the extension must not apply any

     * post-processing and return a regular captured frame. Strength equal to 100 is the

     * default level of post-processing applied when the control is not supported or not set

     * by the client. Values between 0 and 100 will have different effect depending on the

     * extension type as described below:</p>

     * maximum level of post-processing. Values between 0 and 100 will have different effect

     * depending on the extension type as described below:</p>

     * <ul>

     * <li>{@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_BOKEH BOKEH} -

     * the strength is expected to control the amount of blur.</li>
@@ -4211,7 +4210,9 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * {@link android.hardware.camera2.CameraExtensionCharacteristics#getAvailableCaptureRequestKeys }.

     * The control is only defined and available to clients sending capture requests via

     * {@link android.hardware.camera2.CameraExtensionSession }.

     * The default value is 100.</p>

     * If the client doesn't specify the extension strength value, then a default value will

     * be set by the extension. Clients can retrieve the default value by checking the

     * corresponding capture result.</p>

     * <p><b>Range of valid values:</b><br>

     * 0 - 100</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>

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

+5 −4
Original line number Diff line number Diff line
@@ -5694,9 +5694,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>This control allows Camera extension clients to configure the strength of the applied

     * extension effect. Strength equal to 0 means that the extension must not apply any

     * post-processing and return a regular captured frame. Strength equal to 100 is the

     * default level of post-processing applied when the control is not supported or not set

     * by the client. Values between 0 and 100 will have different effect depending on the

     * extension type as described below:</p>

     * maximum level of post-processing. Values between 0 and 100 will have different effect

     * depending on the extension type as described below:</p>

     * <ul>

     * <li>{@link android.hardware.camera2.CameraExtensionCharacteristics#EXTENSION_BOKEH BOKEH} -

     * the strength is expected to control the amount of blur.</li>
@@ -5711,7 +5710,9 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * {@link android.hardware.camera2.CameraExtensionCharacteristics#getAvailableCaptureRequestKeys }.

     * The control is only defined and available to clients sending capture requests via

     * {@link android.hardware.camera2.CameraExtensionSession }.

     * The default value is 100.</p>

     * If the client doesn't specify the extension strength value, then a default value will

     * be set by the extension. Clients can retrieve the default value by checking the

     * corresponding capture result.</p>

     * <p><b>Range of valid values:</b><br>

     * 0 - 100</p>

     * <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>