diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-09-23 00:06:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 00:06:15 +0000 |
| commit | fcb086c8e76bf2fb3c885a633174dee58f512850 (patch) | |
| tree | 2964aa67258114a73659169b0df73ba2425bc348 | |
| parent | 9343c3cb7f624b7b230f460d17343c4d9e65e19e (diff) | |
| parent | 6f387098c2c9006a1fecfe18c7052b2cc40a1941 (diff) | |
| download | frameworks_base-fcb086c8e76bf2fb3c885a633174dee58f512850.zip frameworks_base-fcb086c8e76bf2fb3c885a633174dee58f512850.tar.gz frameworks_base-fcb086c8e76bf2fb3c885a633174dee58f512850.tar.bz2 | |
Merge "camera2: Docs update for available AF modes." into lmp-dev
| -rw-r--r-- | core/java/android/hardware/camera2/CameraCharacteristics.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index c525348..55ca486 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -391,9 +391,9 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri * <p>Not all the auto-focus modes may be supported by a * given camera device. This entry lists the valid modes for * {@link CaptureRequest#CONTROL_AF_MODE android.control.afMode} for this camera device.</p> - * <p>All camera devices will support OFF mode, and all camera devices with - * adjustable focuser units (<code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>) - * will support AUTO mode.</p> + * <p>All LIMITED and FULL mode camera devices will support OFF mode, and all + * camera devices with adjustable focuser units + * (<code>{@link CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE android.lens.info.minimumFocusDistance} > 0</code>) will support AUTO mode.</p> * * @see CaptureRequest#CONTROL_AF_MODE * @see CameraCharacteristics#LENS_INFO_MINIMUM_FOCUS_DISTANCE |