Snap for 7889170 from e2324d155abf61a781346292d3d52ef8be0f0e66 to sc-v2-release

Change-Id: Ie768354facb7bdae6277aa136bc6c711b462326c
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index ce7acf5..64b2c81 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -24230,6 +24230,14 @@
 with test patterns from on-device memory.<wbr/> In that case,<wbr/> it should be
 indistinguishable to the ISP whether the data came from the
 sensor interconnect bus (such as CSI2) or memory.<wbr/></p>
+<p>For privacy use cases,<wbr/> if the camera device:</p>
+<ul>
+<li>supports SOLID_<wbr/>COLOR or BLACK test patterns,<wbr/></li>
+<li>is a logical multi-camera,<wbr/> and</li>
+<li>lists testPatternMode as a physical request key,<wbr/></li>
+</ul>
+<p>Each physical camera must support the same SOLID_<wbr/>COLOR and/<wbr/>or BLACK test patterns
+as the logical camera.<wbr/></p>
             </td>
           </tr>
 
@@ -27842,6 +27850,14 @@
 with test patterns from on-device memory.<wbr/> In that case,<wbr/> it should be
 indistinguishable to the ISP whether the data came from the
 sensor interconnect bus (such as CSI2) or memory.<wbr/></p>
+<p>For privacy use cases,<wbr/> if the camera device:</p>
+<ul>
+<li>supports SOLID_<wbr/>COLOR or BLACK test patterns,<wbr/></li>
+<li>is a logical multi-camera,<wbr/> and</li>
+<li>lists testPatternMode as a physical request key,<wbr/></li>
+</ul>
+<p>Each physical camera must support the same SOLID_<wbr/>COLOR and/<wbr/>or BLACK test patterns
+as the logical camera.<wbr/></p>
             </td>
           </tr>
 
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 8e04848..0459630 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -9643,6 +9643,15 @@
           with test patterns from on-device memory. In that case, it should be
           indistinguishable to the ISP whether the data came from the
           sensor interconnect bus (such as CSI2) or memory.
+
+          For privacy use cases, if the camera device:
+
+          * supports SOLID_COLOR or BLACK test patterns,
+          * is a logical multi-camera, and
+          * lists testPatternMode as a physical request key,
+
+          Each physical camera must support the same SOLID_COLOR and/or BLACK test patterns
+          as the logical camera.
           </hal_details>
         </entry>
       </controls>