diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-05-04 23:38:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-04 23:38:28 +0000 |
| commit | dab404938368fc5bb0a3d9b91135890ab31d0b0c (patch) | |
| tree | fef9d4acd0c0c7db53f280499f03d57c3530f8dc | |
| parent | d0e20951805dfbbc5ff5f546e55a11fd478a1c22 (diff) | |
| parent | b41fcc25068187d562b7ff036ed6ad8079a8a5c8 (diff) | |
| download | frameworks_base-dab404938368fc5bb0a3d9b91135890ab31d0b0c.zip frameworks_base-dab404938368fc5bb0a3d9b91135890ab31d0b0c.tar.gz frameworks_base-dab404938368fc5bb0a3d9b91135890ab31d0b0c.tar.bz2 | |
Merge "Camera2: Minor update for hyperfocalDistance spec"
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index 722d956..28309d7 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -372,7 +372,6 @@ public final class CameraCharacteristics extends CameraMetadata { /** * <p>Optional. Hyperfocal distance for this lens.</p> - * <p>If the lens is fixed focus, the camera device will report 0.</p> * <p>If the lens is not fixed focus, the camera device will report this * field when {@link CameraCharacteristics#LENS_INFO_FOCUS_DISTANCE_CALIBRATION android.lens.info.focusDistanceCalibration} is APPROXIMATE or CALIBRATED.</p> * <p><b>Optional</b> - This value may be {@code null} on some devices.</p> |