diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-17 01:12:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-08-17 01:12:07 +0000 |
| commit | 80199409440c3daf4259bbe22b56bcd9a6db9386 (patch) | |
| tree | bfdb3eda18852edc23cc5036e191c5f11331ff55 | |
| parent | 7eafbfb080a7ac88a9dd863244fca5412cf613c1 (diff) | |
| parent | e36993e6df10042726003cdd7051510302e04c60 (diff) | |
| download | media-android12-s3-release.tar.gz | |
Merge cherrypicks of [15589380, 15589521, 15589522, 15589273, 15589503, 15589504, 15589505, 15589506, 15589507, 15589508, 15589509, 15589510, 15589511, 15589274, 15589562, 15589523, 15589405, 15589406, 15589581, 15589524, 15589525, 15589526, 15589276, 15589277, 15589565, 15589566, 15589528, 15589407, 15589255, 15589516, 15589530, 15589531, 15589569, 15589258] into sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-release
Change-Id: I38ce8f75a5fef3b1d2a91052affccb285e986b9a
| -rw-r--r-- | camera/docs/docs.html | 5 | ||||
| -rw-r--r-- | camera/docs/metadata_definitions.xml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 78a89a9e..fa707ed4 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -19043,7 +19043,10 @@ by binning pixels in 'default' mode and not binning them in 'max resolution' mod <code><a href="#static_android.scaler.streamConfigurationMap">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map</a></code> describes the streams supported in 'default' mode.<wbr/> The stream configurations supported in 'max resolution' mode are described by -<code><a href="#static_android.scaler.streamConfigurationMapMaximumResolution">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map<wbr/>Maximum<wbr/>Resolution</a></code>.<wbr/></p></span> +<code><a href="#static_android.scaler.streamConfigurationMapMaximumResolution">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map<wbr/>Maximum<wbr/>Resolution</a></code>.<wbr/> +The maximum resolution mode pixel array size of a camera device +(<code><a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a></code>) with this capability,<wbr/> +will be at least 24 megapixels.<wbr/></p></span> </li> <li> <span class="entry_type_enum_name">REMOSAIC_REPROCESSING (v3.6)</span> diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index 86de1985..c23bd46b 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -6118,6 +6118,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata mode. The stream configurations supported in 'max resolution' mode are described by `android.scaler.streamConfigurationMapMaximumResolution`. + The maximum resolution mode pixel array size of a camera device + (`android.sensor.info.pixelArraySize`) with this capability, + will be at least 24 megapixels. </notes> </value> <value optional="true" visibility="java_public" hal_version="3.6">REMOSAIC_REPROCESSING |