Merge "camera_metadata: Fix inconsistencies in digital zoom reporting" into jb-mr2-dev
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 9e9cafd..65d6f00 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -2038,8 +2038,13 @@
<td class="entry_name">android.<wbr>control.<wbr>awb<wbr>Available<wbr>Modes</td>
<td class="entry_type">
<span class="entry_type_name">byte</span>
+ <span class="entry_type_container">x</span>
+ <span class="entry_type_array">
+ n
+ </span>
+ <div class="entry_type_notes">List of enums (android.<wbr>control.<wbr>awb<wbr>Mode)</div>
</td> <!-- entry_type -->
@@ -2048,7 +2053,6 @@
</td>
<td class="entry_units">
- List of enums (android.<wbr>control.<wbr>awb<wbr>Mode)
</td>
<td class="entry_range">
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 0545f07..a5188cc 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -592,8 +592,12 @@
<range>OFF must be included</range>
<tag id="BC" />
</entry>
- <entry name="awbAvailableModes" type="byte">
- <units>List of enums (android.control.awbMode)</units>
+ <entry name="awbAvailableModes" type="byte"
+ type_notes="List of enums (android.control.awbMode)"
+ container="array">
+ <array>
+ <size>n</size>
+ </array>
<range>OFF, AUTO must be included</range>
<tag id="BC" />
</entry>
