Merge "camera: Update logical multi-camera requirement"

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 92afa1b..f4c60ec 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -16888,19 +16888,24 @@ also exposed to the application.<wbr/></p>
 <li><a href="#static_android.lens.radialDistortion">android.<wbr/>lens.<wbr/>radial<wbr/>Distortion</a></li>
 </ul>
 </li>
+<li>The SENSOR_<wbr/>INFO_<wbr/>TIMESTAMP_<wbr/>SOURCE of the logical device and physical devices must be
+  the same.<wbr/></li>
 <li>The logical camera device must be LIMITED or higher device.<wbr/></li>
 </ul>
 <p>Both the logical camera device and its underlying physical devices support the
 mandatory stream combinations required for their device levels.<wbr/></p>
 <p>Additionally,<wbr/> for each guaranteed stream combination,<wbr/> the logical camera supports:</p>
 <ul>
-<li>Replacing one logical <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">YUV_<wbr/>420_<wbr/>888</a>
+<li>For each guaranteed stream combination,<wbr/> the logical camera supports replacing one
+  logical <a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">YUV_<wbr/>420_<wbr/>888</a>
   or raw stream with two physical streams of the same size and format,<wbr/> each from a
   separate physical camera,<wbr/> given that the size and format are supported by both
   physical cameras.<wbr/></li>
-<li>Adding two raw streams,<wbr/> each from one physical camera,<wbr/> if the logical camera doesn't
-  advertise RAW capability,<wbr/> but the underlying physical cameras do.<wbr/> This is usually
-  the case when the physical cameras have different sensor sizes.<wbr/></li>
+<li>If the logical camera doesn't advertise RAW capability,<wbr/> but the underlying physical
+  cameras do,<wbr/> the logical camera will support guaranteed stream combinations for RAW
+  capability,<wbr/> except that the RAW streams will be physical streams,<wbr/> each from a separate
+  physical camera.<wbr/> This is usually the case when the physical cameras have different
+  sensor sizes.<wbr/></li>
 </ul>
 <p>Using physical streams in place of a logical stream of the same size and format will
 not slow down the frame rate of the capture,<wbr/> as long as the minimum frame duration

diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index dec8acb..1130411 100644 (file)
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -5122,6 +5122,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
                   - android.lens.poseTranslation
                   - android.lens.intrinsicCalibration
                   - android.lens.radialDistortion
+              * The SENSOR_INFO_TIMESTAMP_SOURCE of the logical device and physical devices must be
+                the same.
               * The logical camera device must be LIMITED or higher device.
 
               Both the logical camera device and its underlying physical devices support the
@@ -5129,13 +5131,16 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
               Additionally, for each guaranteed stream combination, the logical camera supports:
 
-              * Replacing one logical {@link android.graphics.ImageFormat#YUV_420_888|AIMAGE_FORMAT_YUV_420_888 YUV_420_888}
+              * For each guaranteed stream combination, the logical camera supports replacing one
+                logical {@link android.graphics.ImageFormat#YUV_420_888|AIMAGE_FORMAT_YUV_420_888 YUV_420_888}
                 or raw stream with two physical streams of the same size and format, each from a
                 separate physical camera, given that the size and format are supported by both
                 physical cameras.
-              * Adding two raw streams, each from one physical camera, if the logical camera doesn't
-                advertise RAW capability, but the underlying physical cameras do. This is usually
-                the case when the physical cameras have different sensor sizes.
+              * If the logical camera doesn't advertise RAW capability, but the underlying physical
+                cameras do, the logical camera will support guaranteed stream combinations for RAW
+                capability, except that the RAW streams will be physical streams, each from a separate
+                physical camera. This is usually the case when the physical cameras have different
+                sensor sizes.
 
               Using physical streams in place of a logical stream of the same size and format will
               not slow down the frame rate of the capture, as long as the minimum frame duration