Snap for 7992035 from ba40f06ea96bdc75e75c0d7e96dc826312601e3d to sc-d2-release
Change-Id: Id2a32ffd29c736d33233d83a16971a00776b8703
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 64b2c81..dbeca53 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -21506,7 +21506,8 @@
</tbody>
</table>
<p>For applications targeting SDK version 31 or newer,<wbr/> if the mobile device declares to be
-<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">media performance class</a> S,<wbr/>
+media performance class 12 or higher by setting
+<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> to be 31 or larger,<wbr/>
the primary camera devices (first rear/<wbr/>front camera in the camera ID list) will not
support JPEG sizes smaller than 1080p.<wbr/> If the application configures a JPEG stream
smaller than 1080p,<wbr/> the camera device will round up the JPEG image size to at least
@@ -21579,9 +21580,11 @@
</tbody>
</table>
<p>For applications targeting SDK version 31 or newer,<wbr/> if the mobile device doesn't declare
-to be media performance class S,<wbr/> or if the camera device isn't a primary rear/<wbr/>front
-camera,<wbr/> the minimum required output stream configurations are the same as for applications
-targeting SDK version older than 31.<wbr/></p>
+to be media performance class 12 or better by setting
+<a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> to be 31 or larger,<wbr/>
+or if the camera device isn't a primary rear/<wbr/>front camera,<wbr/> the minimum required output
+stream configurations are the same as for applications targeting SDK version older than
+31.<wbr/></p>
<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
@@ -21630,10 +21633,11 @@
<li>720p (1280 x 720)</li>
<li>1080p (1920 x 1080)</li>
</ul>
-<p>Note that for Performance Class 12 primary cameras (first rear/<wbr/>front facing camera in the
-camera ID list),<wbr/> camera framework filters out JPEG sizes smaller than 1080p depending on
+<p>Note that for primary cameras (first rear/<wbr/>front facing camera in the camera ID list)
+on a device with <a href="https://developer.android.com/reference/android/os/Build/VERSION_CDOES/MEDIA_PERFORMANCE_CLASS.html">MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> set to
+31 or larger,<wbr/> camera framework filters out JPEG sizes smaller than 1080p depending on
applications' targetSdkLevel.<wbr/> The camera HAL must still support the smaller JPEG sizes
-to maintain backward comopatibility.<wbr/></p>
+to maintain backward compatibility.<wbr/></p>
<p>For LIMITED capability devices
(<code><a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> == LIMITED</code>),<wbr/>
the HAL only has to list up to the maximum video size
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 0459630..af1eab8 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -7114,7 +7114,8 @@
IMPLEMENTATION_DEFINED | same as YUV_420_888 | Any |
For applications targeting SDK version 31 or newer, if the mobile device declares to be
- {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS media performance class} S,
+ media performance class 12 or higher by setting
+ {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} to be 31 or larger,
the primary camera devices (first rear/front camera in the camera ID list) will not
support JPEG sizes smaller than 1080p. If the application configures a JPEG stream
smaller than 1080p, the camera device will round up the JPEG image size to at least
@@ -7134,9 +7135,11 @@
IMPLEMENTATION_DEFINED | same as YUV_420_888 | Any |
For applications targeting SDK version 31 or newer, if the mobile device doesn't declare
- to be media performance class S, or if the camera device isn't a primary rear/front
- camera, the minimum required output stream configurations are the same as for applications
- targeting SDK version older than 31.
+ to be media performance class 12 or better by setting
+ {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} to be 31 or larger,
+ or if the camera device isn't a primary rear/front camera, the minimum required output
+ stream configurations are the same as for applications targeting SDK version older than
+ 31.
Refer to android.request.availableCapabilities for additional
mandatory stream configurations on a per-capability basis.
@@ -7186,10 +7189,11 @@
* 720p (1280 x 720)
* 1080p (1920 x 1080)
- Note that for Performance Class 12 primary cameras (first rear/front facing camera in the
- camera ID list), camera framework filters out JPEG sizes smaller than 1080p depending on
+ Note that for primary cameras (first rear/front facing camera in the camera ID list)
+ on a device with {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS} set to
+ 31 or larger, camera framework filters out JPEG sizes smaller than 1080p depending on
applications' targetSdkLevel. The camera HAL must still support the smaller JPEG sizes
- to maintain backward comopatibility.
+ to maintain backward compatibility.
For LIMITED capability devices
(`android.info.supportedHardwareLevel == LIMITED`),
