Snap for 4384531 from 34893ec78fce2961bccaee6f81448c2fcfb7811d to oc-m2-releaseandroid-8.1.0_r2

Change-Id: Ib957eb92ce0bb964a3fe53b8eaeade3540ac793f

3 files changed, 18 insertions, 18 deletions

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index e8613126..1f141575 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -16137,8 +16137,8 @@ in <a href="#static_android.request.availableCapabilities">android.<wbr/>request
           </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 @@ in <a href="#static_android.request.availableCapabilities">android.<wbr/>request
               <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 @@ details.<wbr/></p>
               <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 f800efe9..291afec2 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -5054,8 +5054,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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 cb346f36..6f04e17a 100644
--- a/camera/docs/ndk_metadata_properties.xml
+++ b/camera/docs/ndk_metadata_properties.xml
@@ -5058,8 +5058,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           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.