diff options
| author | 2010-05-20 01:48:26 -0700 | |
|---|---|---|
| committer | 2010-05-20 01:48:26 -0700 | |
| commit | 2ee95ad696e032fec45dc156f28efb7dbdf8e03f (patch) | |
| tree | 991cc5873fa4edc7d5e84829c49cc2bbfdb081f7 | |
| parent | b482577a1bc2a5397763b9d2257dbd7b65edfa3d (diff) | |
| parent | 5badcabadbd5874ec42ca14a4e4e66bd3f2b65c2 (diff) | |
am 5badcaba: Merge "Fix javadoc of camera focus distances API." into kraken
| -rw-r--r-- | core/java/android/hardware/Camera.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 46c6cb8a6c69..31d9a2a74a17 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1845,21 +1845,19 @@ public class Camera { * #autoFocus(AutoFocusCallback)}, {@link #cancelAutoFocus}, or {@link * #startPreview()}. Applications can call {@link #getParameters()} * and this method anytime to get the latest focus distances. If the - * focus mode is FOCUS_MODE_EDOF, the values may be all 0, which means - * focus distance is not applicable. If the focus mode is - * FOCUS_MODE_CONTINUOUS and autofocus has started, focus distances may - * change from time to time. + * focus mode is FOCUS_MODE_CONTINUOUS and autofocus has started, focus + * distances may change from time to time. * - * Far focus distance > optimal focus distance > near focus distance. If - * the far focus distance is infinity, the value will be + * Far focus distance >= optimal focus distance >= near focus distance. + * If the focus distance is infinity, the value will be * Float.POSITIVE_INFINITY. * * @param output focus distances in meters. output must be a float * array with three elements. Near focus distance, optimal focus * distance, and far focus distance will be filled in the array. - * @see #NEAR_FOCUS_DISTANCE_INDEX - * @see #OPTIMAL_FOCUS_DISTANCE_INDEX - * @see #FAR_FOCUS_DISTANCE_INDEX + * @see #FOCUS_DISTANCE_NEAR_INDEX + * @see #FOCUS_DISTANCE_OPTIMAL_INDEX + * @see #FOCUS_DISTANCE_FAR_INDEX */ public void getFocusDistances(float[] output) { if (output == null || output.length != 3) { |