summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-03-19 02:12:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-03-19 02:12:08 +0000
commit555084b3a55719e1bf33974f0a8334ee345fc3dd (patch)
tree7888711951ee0450aa7a02b365bab83649bc4c72 /core/java
parent87c20886dcf87731c76e6f1b9adf6571a81bbd43 (diff)
parentca2926f83b9fa2f5744493ba2dbc6570b751399d (diff)
downloadframeworks_base-555084b3a55719e1bf33974f0a8334ee345fc3dd.zip
frameworks_base-555084b3a55719e1bf33974f0a8334ee345fc3dd.tar.gz
frameworks_base-555084b3a55719e1bf33974f0a8334ee345fc3dd.tar.bz2
Merge "Camera2: Update exposureTimeRange related docs"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/camera2/CaptureRequest.java1
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/CaptureRequest.java b/core/java/android/hardware/camera2/CaptureRequest.java
index f6a6f96..7656505 100644
--- a/core/java/android/hardware/camera2/CaptureRequest.java
+++ b/core/java/android/hardware/camera2/CaptureRequest.java
@@ -1120,7 +1120,6 @@ public final class CaptureRequest extends CameraMetadata implements Parcelable {
* light.</p>
* <p>If the sensor can't expose this exact duration, it should shorten the
* duration exposed to the nearest possible value (rather than expose longer).</p>
- * <p>1/10000 - 30 sec range. No bulb mode</p>
*/
public static final Key<Long> SENSOR_EXPOSURE_TIME =
new Key<Long>("android.sensor.exposureTime", long.class);
diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java
index 7eb63d6..03661f0 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -1490,7 +1490,6 @@ public final class CaptureResult extends CameraMetadata {
* light.</p>
* <p>If the sensor can't expose this exact duration, it should shorten the
* duration exposed to the nearest possible value (rather than expose longer).</p>
- * <p>1/10000 - 30 sec range. No bulb mode</p>
*/
public static final Key<Long> SENSOR_EXPOSURE_TIME =
new Key<Long>("android.sensor.exposureTime", long.class);