diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-05-15 16:03:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-15 16:03:31 +0000 |
| commit | 99dc89961f192b8570215ebe8feff1945a7c53ea (patch) | |
| tree | 5d72ff468a6adefe2c2414ff0a1a2e03ad0c3a4a | |
| parent | 0c72f4f9d04077f2fe96b486b8501303325a54af (diff) | |
| parent | 527d522f349d806fa9765130269de5a759cb6b69 (diff) | |
| download | frameworks_base-99dc89961f192b8570215ebe8feff1945a7c53ea.zip frameworks_base-99dc89961f192b8570215ebe8feff1945a7c53ea.tar.gz frameworks_base-99dc89961f192b8570215ebe8feff1945a7c53ea.tar.bz2 | |
Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureRequest.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java index 3ec11b7..5fb9abc 100644 --- a/core/java/android/hardware/camera2/CaptureRequest.java +++ b/core/java/android/hardware/camera2/CaptureRequest.java @@ -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 diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index d931a76..0277c5b 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -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 |