summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2015-05-14 15:36:04 -0700
committerZhijun He <zhijunhe@google.com>2015-05-14 15:36:04 -0700
commit527d522f349d806fa9765130269de5a759cb6b69 (patch)
treee5888921894d20a2221b185ffdbd2fc75d77adc8 /core/java/android/hardware
parentd99dc329b9baefe3d722ccafc0c92461cfef42b1 (diff)
downloadframeworks_base-527d522f349d806fa9765130269de5a759cb6b69.zip
frameworks_base-527d522f349d806fa9765130269de5a759cb6b69.tar.gz
frameworks_base-527d522f349d806fa9765130269de5a759cb6b69.tar.bz2
Camera2: get ride of sceneModeOverrides in API doc
sceneModeOverrides isn't public API. Bug: 20152738 Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/CaptureRequest.java2
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java2
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