Snap for 4378450 from 3984754b77a90c90ac427f7585893fc26ca627aa to oc-mr1-release
Change-Id: Ie2453d822f0207b309548694b0c2c0b4ef0b2b7d
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index e861312..1f14157 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -16137,8 +16137,8 @@
</tr>
<tr class="entry_cont">
<td class="entry_details" colspan="5">
- <p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+ <p>Vendor tags can be listed here.<wbr/> Vendor tag metadata should also
+use the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
<p>Setting/<wbr/>getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.<wbr/></p>
<p>The HAL must not consume any request tags that are not listed either
@@ -16220,8 +16220,8 @@
<p>Tags listed here must always have an entry in the result metadata,<wbr/>
even if that size is 0 elements.<wbr/> Only array-type tags (e.<wbr/>g.<wbr/> lists,<wbr/>
matrices,<wbr/> strings) are allowed to have 0 elements.<wbr/></p>
-<p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+<p>Vendor tags can be listed here.<wbr/> Vendor tag metadata should also
+use the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
<p>Setting/<wbr/>getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.<wbr/></p>
<p>The HAL must not produce any result tags that are not listed either
@@ -16291,8 +16291,8 @@
<p>Keys listed here must always have an entry in the static info metadata,<wbr/>
even if that size is 0 elements.<wbr/> Only array-type tags (e.<wbr/>g.<wbr/> lists,<wbr/>
matrices,<wbr/> strings) are allowed to have 0 elements.<wbr/></p>
-<p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+<p>Vendor tags can listed here.<wbr/> Vendor tag metadata should also use
+the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
<p>Setting/<wbr/>getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.<wbr/></p>
<p>The HAL must not have any tags in its static info that are not listed
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index f800efe..291afec 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -5054,8 +5054,8 @@
in android.request.availableCapabilities.
</details>
<hal_details>
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can be listed here. Vendor tag metadata should also
+ use the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
@@ -5098,8 +5098,8 @@
even if that size is 0 elements. Only array-type tags (e.g. lists,
matrices, strings) are allowed to have 0 elements.
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can be listed here. Vendor tag metadata should also
+ use the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
@@ -5128,8 +5128,8 @@
even if that size is 0 elements. Only array-type tags (e.g. lists,
matrices, strings) are allowed to have 0 elements.
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can listed here. Vendor tag metadata should also use
+ the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
diff --git a/camera/docs/ndk_metadata_properties.xml b/camera/docs/ndk_metadata_properties.xml
index cb346f3..6f04e17 100644
--- a/camera/docs/ndk_metadata_properties.xml
+++ b/camera/docs/ndk_metadata_properties.xml
@@ -5058,8 +5058,8 @@
in android.request.availableCapabilities.
</details>
<hal_details>
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can be listed here. Vendor tag metadata should also use
+ the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
@@ -5103,8 +5103,8 @@
even if that size is 0 elements. Only array-type tags (e.g. lists,
matrices, strings) are allowed to have 0 elements.
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can be listed here. Vendor tag metadata should also use
+ the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
@@ -5134,8 +5134,8 @@
even if that size is 0 elements. Only array-type tags (e.g. lists,
matrices, strings) are allowed to have 0 elements.
- Vendor tags must not be listed here. Use the vendor tag metadata
- extensions C api instead (refer to camera3.h for more details).
+ Vendor tags can be listed here. Vendor tag metadata should also use
+ the extensions C api (refer to camera3.h for more details).
Setting/getting vendor tags will be checked against the metadata
vendor extensions API and not against this field.
