Merge "Camera: fix CaptureResultTest codegen" into mnc-dev

3 files changed, 17 insertions, 14 deletions

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 11715530..01850b06 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -14795,8 +14795,8 @@ stages.<wbr/> This means the following controls are guaranteed to be supported:<
 <li><a href="#controls_android.tonemap.curve">android.<wbr/>tonemap.<wbr/>curve</a></li>
 <li><a href="#controls_android.tonemap.mode">android.<wbr/>tonemap.<wbr/>mode</a></li>
 <li><a href="#static_android.tonemap.maxCurvePoints">android.<wbr/>tonemap.<wbr/>max<wbr/>Curve<wbr/>Points</a></li>
-<li><a href="#dynamic_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a></li>
-<li><a href="#dynamic_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a></li>
+<li><a href="#controls_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a></li>
+<li><a href="#controls_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a></li>
 </ul>
 </li>
 <li>
@@ -23134,19 +23134,19 @@ the cost of possibly reduced frame rate compared to raw sensor output.<wbr/></p>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">GAMMA_VALUE</span>
-                    <span class="entry_type_enum_notes"><p>Use the gamma value specified in <a href="#dynamic_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a> to peform
+                    <span class="entry_type_enum_notes"><p>Use the gamma value specified in <a href="#controls_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a> to peform
 tonemapping.<wbr/></p>
 <p>All color enhancement and tonemapping must be disabled,<wbr/> except
-for applying the tonemapping curve specified by <a href="#dynamic_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a>.<wbr/></p>
+for applying the tonemapping curve specified by <a href="#controls_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a>.<wbr/></p>
 <p>Must not slow down frame rate relative to raw sensor output.<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">PRESET_CURVE</span>
                     <span class="entry_type_enum_notes"><p>Use the preset tonemapping curve specified in
-<a href="#dynamic_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a> to peform tonemapping.<wbr/></p>
+<a href="#controls_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a> to peform tonemapping.<wbr/></p>
 <p>All color enhancement and tonemapping must be disabled,<wbr/> except
 for applying the tonemapping curve specified by
-<a href="#dynamic_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a>.<wbr/></p>
+<a href="#controls_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a>.<wbr/></p>
 <p>Must not slow down frame rate relative to raw sensor output.<wbr/></p></span>
                   </li>
                 </ul>
@@ -23848,19 +23848,19 @@ the cost of possibly reduced frame rate compared to raw sensor output.<wbr/></p>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">GAMMA_VALUE</span>
-                    <span class="entry_type_enum_notes"><p>Use the gamma value specified in <a href="#dynamic_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a> to peform
+                    <span class="entry_type_enum_notes"><p>Use the gamma value specified in <a href="#controls_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a> to peform
 tonemapping.<wbr/></p>
 <p>All color enhancement and tonemapping must be disabled,<wbr/> except
-for applying the tonemapping curve specified by <a href="#dynamic_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a>.<wbr/></p>
+for applying the tonemapping curve specified by <a href="#controls_android.tonemap.gamma">android.<wbr/>tonemap.<wbr/>gamma</a>.<wbr/></p>
 <p>Must not slow down frame rate relative to raw sensor output.<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">PRESET_CURVE</span>
                     <span class="entry_type_enum_notes"><p>Use the preset tonemapping curve specified in
-<a href="#dynamic_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a> to peform tonemapping.<wbr/></p>
+<a href="#controls_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a> to peform tonemapping.<wbr/></p>
 <p>All color enhancement and tonemapping must be disabled,<wbr/> except
 for applying the tonemapping curve specified by
-<a href="#dynamic_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a>.<wbr/></p>
+<a href="#controls_android.tonemap.presetCurve">android.<wbr/>tonemap.<wbr/>preset<wbr/>Curve</a>.<wbr/></p>
 <p>Must not slow down frame rate relative to raw sensor output.<wbr/></p></span>
                   </li>
                 </ul>
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 9b121d12..fd21fbd5 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -202,6 +202,7 @@ insert_file "$outdir/CameraMetadataEnums.java.part" "$fwkdir/CameraMetadata.java
 insert_file "$outdir/CameraCharacteristicsKeys.java.part" "$fwkdir/CameraCharacteristics.java" || exit 1
 insert_file "$outdir/CaptureRequestKeys.java.part" "$fwkdir/CaptureRequest.java" || exit 1
 insert_file "$outdir/CaptureResultKeys.java.part" "$fwkdir/CaptureResult.java" || exit 1
+insert_file "$outdir/CaptureResultTest.java.part" "$ctsdir/CaptureResultTest.java" || exit 1
 
 # Copy ./images directory into javadoc directory
 copy_directory "images" "$fwkdir_html" || exit 1
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 2effaaaa..80cd6a0f 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -7451,10 +7451,6 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         </clone>
         <clone entry="android.tonemap.mode" kind="controls">
         </clone>
-        <clone entry="android.tonemap.gamma" kind="controls">
-        </clone>
-        <clone entry="android.tonemap.presetCurve" kind="controls">
-        </clone>
       </dynamic>
       <controls>
         <entry name="gamma" type="float" visibility="public">
@@ -7504,6 +7500,12 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </details>
         </entry>
       </controls>
+      <dynamic>
+        <clone entry="android.tonemap.gamma" kind="controls">
+        </clone>
+        <clone entry="android.tonemap.presetCurve" kind="controls">
+        </clone>
+      </dynamic>
     </section>
     <section name="led">
       <controls>