Camera2: update hyperfocalDistance spec

Change-Id: I1b425ab739f10d5e2ba9403baf918f3ee6150d71

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index a249769..70a9328 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -7681,7 +7681,8 @@ contain only OFF.<wbr/></p>
             </td>
 
             <td class="entry_range">
-              <p>&gt;= 0</p>
+              <p>If lens is fixed focus,<wbr/> &gt;= 0.<wbr/> If lens has focuser unit,<wbr/> the range is
+<code>(0,<wbr/> <a href="#static_android.lens.info.minimumFocusDistance">android.<wbr/>lens.<wbr/>info.<wbr/>minimum<wbr/>Focus<wbr/>Distance</a>]</code></p>
             </td>
 
             <td class="entry_tags">
@@ -7693,8 +7694,7 @@ contain only OFF.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>If the lens is fixed focus,<wbr/> the camera device will report 0.<wbr/></p>
-<p>If the lens is not fixed focus,<wbr/> the camera device will report this
+              <p>If the lens is not fixed focus,<wbr/> the camera device will report this
 field when <a href="#static_android.lens.info.focusDistanceCalibration">android.<wbr/>lens.<wbr/>info.<wbr/>focus<wbr/>Distance<wbr/>Calibration</a> is APPROXIMATE or CALIBRATED.<wbr/></p>
             </td>
           </tr>

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index e929d8d..3c910d1 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2252,9 +2252,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <entry name="hyperfocalDistance" type="float" visibility="public" optional="true">
             <description>Optional. Hyperfocal distance for this lens.</description>
             <units>See android.lens.info.focusDistanceCalibration for details.</units>
-            <range>&amp;gt;= 0</range>
-            <details>If the lens is fixed focus, the camera device will report 0.
-
+            <range>If lens is fixed focus, &amp;gt;= 0. If lens has focuser unit, the range is
+            `(0, android.lens.info.minimumFocusDistance]`</range>
+            <details>
             If the lens is not fixed focus, the camera device will report this
             field when android.lens.info.focusDistanceCalibration is APPROXIMATE or CALIBRATED.
             </details>