Snap for 5735642 from 60fe8c9ef89c0eece28618c68a7c361c963b398a to sdk-release
Change-Id: Ia99f5a93c01a33b98208c97420ab3507cefe75b3
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 4a8a9c7..e834cd3 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -17781,7 +17781,7 @@
</td> <!-- entry_type -->
<td class="entry_description">
- <p>A subset of the available request keys that can be overriden for
+ <p>A subset of the available request keys that can be overridden for
physical devices backing a logical multi-camera.<wbr/></p>
</td>
@@ -17805,7 +17805,7 @@
<tr class="entry_cont">
<td class="entry_details" colspan="6">
<p>This is a subset of <a href="#static_android.request.availableRequestKeys">android.<wbr/>request.<wbr/>available<wbr/>Request<wbr/>Keys</a> which contains a list
-of keys that can be overriden using <a href="https://developer.android.com/reference/CaptureRequest/Builder.html#setPhysicalCameraKey">Builder#setPhysicalCameraKey</a>.<wbr/>
+of keys that can be overridden using <a href="https://developer.android.com/reference/CaptureRequest/Builder.html#setPhysicalCameraKey">Builder#setPhysicalCameraKey</a>.<wbr/>
The respective value of such request key can be obtained by calling
<a href="https://developer.android.com/reference/CaptureRequest/Builder.html#getPhysicalCameraKey">Builder#getPhysicalCameraKey</a>.<wbr/> Capture requests that contain
individual physical device requests must be built via
@@ -19286,6 +19286,12 @@
</table>
<p>Refer to <a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a> for additional
mandatory stream configurations on a per-capability basis.<wbr/></p>
+<p>Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability for
+downscaling from larger resolution to smaller,<wbr/> and the QCIF resolution sometimes is not
+fully supported due to this limitation on devices with high-resolution image sensors.<wbr/>
+Therefore,<wbr/> trying to configure a QCIF resolution stream together with any other
+stream larger than 1920x1080 resolution (either width or height) might not be supported,<wbr/>
+and capture session creation will fail if it is not.<wbr/></p>
</td>
</tr>
@@ -19670,6 +19676,12 @@
ratio 4:3,<wbr/> and the JPEG encoder alignment requirement is 16,<wbr/> the maximum JPEG size will be
3264x2448.<wbr/></li>
</ul>
+<p>Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability on
+downscaling from larger resolution to smaller ones,<wbr/> and the QCIF resolution can sometimes
+not be fully supported due to this limitation on devices with high-resolution image
+sensors.<wbr/> Therefore,<wbr/> trying to configure a QCIF resolution stream together with any other
+stream larger than 1920x1080 resolution (either width or height) might not be supported,<wbr/>
+and capture session creation will fail if it is not.<wbr/></p>
</td>
</tr>
@@ -28588,7 +28600,7 @@
<li><code>LEVEL_<wbr/>3</code> devices additionally support YUV reprocessing and RAW image capture,<wbr/> along
with additional output stream configurations.<wbr/></li>
<li><code>EXTERNAL</code> devices are similar to <code>LIMITED</code> devices with exceptions like some sensor or
- lens information not reorted or less stable framerates.<wbr/></li>
+ lens information not reported or less stable framerates.<wbr/></li>
</ul>
<p>See the individual level enums for full descriptions of the supported capabilities.<wbr/> The
<a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a> entry describes the device's capabilities at a
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index c5a7456..c9d56be 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -5614,11 +5614,11 @@
<array>
<size>n</size>
</array>
- <description>A subset of the available request keys that can be overriden for
+ <description>A subset of the available request keys that can be overridden for
physical devices backing a logical multi-camera.</description>
<details>
This is a subset of android.request.availableRequestKeys which contains a list
- of keys that can be overriden using {@link CaptureRequest.Builder#setPhysicalCameraKey}.
+ of keys that can be overridden using {@link CaptureRequest.Builder#setPhysicalCameraKey}.
The respective value of such request key can be obtained by calling
{@link CaptureRequest.Builder#getPhysicalCameraKey}. Capture requests that contain
individual physical device requests must be built via
@@ -6169,6 +6169,14 @@
Refer to android.request.availableCapabilities for additional
mandatory stream configurations on a per-capability basis.
+
+ Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability for
+ downscaling from larger resolution to smaller, and the QCIF resolution sometimes is not
+ fully supported due to this limitation on devices with high-resolution image sensors.
+ Therefore, trying to configure a QCIF resolution stream together with any other
+ stream larger than 1920x1080 resolution (either width or height) might not be supported,
+ and capture session creation will fail if it is not.
+
</details>
<hal_details>
It is recommended (but not mandatory) to also include half/quarter
@@ -6385,6 +6393,14 @@
if the sensor maximum resolution is 3280x2464, if the maximum JPEG size has aspect
ratio 4:3, and the JPEG encoder alignment requirement is 16, the maximum JPEG size will be
3264x2448.
+
+ Exception on 176x144 (QCIF) resolution: camera devices usually have a fixed capability on
+ downscaling from larger resolution to smaller ones, and the QCIF resolution can sometimes
+ not be fully supported due to this limitation on devices with high-resolution image
+ sensors. Therefore, trying to configure a QCIF resolution stream together with any other
+ stream larger than 1920x1080 resolution (either width or height) might not be supported,
+ and capture session creation will fail if it is not.
+
</details>
<hal_details>
Do not set this property directly
@@ -9308,7 +9324,7 @@
* `LEVEL_3` devices additionally support YUV reprocessing and RAW image capture, along
with additional output stream configurations.
* `EXTERNAL` devices are similar to `LIMITED` devices with exceptions like some sensor or
- lens information not reorted or less stable framerates.
+ lens information not reported or less stable framerates.
See the individual level enums for full descriptions of the supported capabilities. The
android.request.availableCapabilities entry describes the device's capabilities at a
