diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 09:07:55 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 09:07:55 +0000 |
commit | 56fdecfbcbca856b8866d13485e417ea64b8ab83 (patch) | |
tree | 5c3e425d3fae63659a112eb8f21ba924f7067274 | |
parent | 5e6f6c66c1339c218eb3a45e27e34423be9d4155 (diff) | |
parent | 92c52f3a808a83d4ac4441f33c802fdb498b537e (diff) | |
download | base-56fdecfbcbca856b8866d13485e417ea64b8ab83.tar.gz |
Snap for 10632098 from 92c52f3a808a83d4ac4441f33c802fdb498b537e to mainline-mediaprovider-releaseaml_mpr_341015090aml_mpr_341015030
Change-Id: Id875562d3ff4fc65f42b400093edc105f59328b3
-rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 9 | ||||
-rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index c872516014db..59408191cdf5 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -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> diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 57f7bca1f67e..905f98de75ff 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -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> |