Merge "Camera: update AE/AWB lock spec"

2 files changed, 30 insertions, 5 deletions

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 3b1640b5..93472d30 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -5120,7 +5120,8 @@ for preview only streaming case.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>LIMITED or FULL devices will always list <code>true</code></p>
+              <p>Devices with MANUAL_<wbr/>SENSOR capability or BURST_<wbr/>CAPTURE capability will always
+list <code>true</code>.<wbr/> This includes FULL devices.<wbr/></p>
             </td>
           </tr>
 
@@ -5177,7 +5178,8 @@ for preview only streaming case.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>LIMITED or FULL devices will always list <code>true</code></p>
+              <p>Devices with MANUAL_<wbr/>POST_<wbr/>PROCESSING capability or BURST_<wbr/>CAPTURE capability will
+always list <code>true</code>.<wbr/> This includes FULL devices.<wbr/></p>
             </td>
           </tr>
 
@@ -14744,6 +14746,10 @@ guaranteed to be supported:</p>
 <li><a href="#controls_android.blackLevel.lock">android.<wbr/>black<wbr/>Level.<wbr/>lock</a></li>
 </ul>
 </li>
+<li>Auto exposure lock<ul>
+<li><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a></li>
+</ul>
+</li>
 </ul>
 <p>If any of the above 3A algorithms are enabled,<wbr/> then the camera
 device will accurately report the values applied by 3A in the
@@ -14790,6 +14796,10 @@ stages.<wbr/> This means the following controls are guaranteed to be supported:<
 <li><a href="#static_android.colorCorrection.availableAberrationModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Modes</a></li>
 </ul>
 </li>
+<li>Auto white balance lock<ul>
+<li><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a></li>
+</ul>
+</li>
 </ul>
 <p>If auto white balance is enabled,<wbr/> then the camera device
 will accurately report the values applied by AWB in the result.<wbr/></p>
@@ -14891,7 +14901,11 @@ lists at least one FPS range where the minimum FPS is</p>
 YUV_<wbr/>420_<wbr/>888 format.<wbr/></p>
 </blockquote>
 <p>In addition,<wbr/> the <a href="#static_android.sync.maxLatency">android.<wbr/>sync.<wbr/>max<wbr/>Latency</a> field is
-guaranted to have a value between 0 and 4,<wbr/> inclusive.<wbr/></p></span>
+guaranted to have a value between 0 and 4,<wbr/> inclusive.<wbr/>
+<a href="#static_android.control.aeLockAvailable">android.<wbr/>control.<wbr/>ae<wbr/>Lock<wbr/>Available</a> and
+<a href="#static_android.control.awbLockAvailable">android.<wbr/>control.<wbr/>awb<wbr/>Lock<wbr/>Available</a> are also guaranteed
+to be <code>true</code> so burst capture with these two locks ON
+yields consistent image output.<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">YUV_REPROCESSING</span>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 18dc7b7d..6b7cfc5e 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2535,7 +2535,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether the camera device supports android.control.aeLock</description>
           <details>
-          LIMITED or FULL devices will always list `true`
+              Devices with MANUAL_SENSOR capability or BURST_CAPTURE capability will always
+              list `true`. This includes FULL devices.
           </details>
           <tag id="BC"/>
         </entry>
@@ -2547,7 +2548,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </enum>
           <description>Whether the camera device supports android.control.awbLock</description>
           <details>
-          LIMITED or FULL devices will always list `true`
+              Devices with MANUAL_POST_PROCESSING capability or BURST_CAPTURE capability will
+              always list `true`. This includes FULL devices.
           </details>
           <tag id="BC"/>
         </entry>
@@ -4212,6 +4214,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
                   * android.flash.*
               * Manual black level locking
                   * android.blackLevel.lock
+              * Auto exposure lock
+                  * android.control.aeLock
 
               If any of the above 3A algorithms are enabled, then the camera
               device will accurately report the values applied by 3A in the
@@ -4249,6 +4253,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
               * Manual aberration correction control (if aberration correction is supported)
                     * android.colorCorrection.aberrationMode
                     * android.colorCorrection.availableAberrationModes
+              * Auto white balance lock
+                    * android.control.awbLock
 
               If auto white balance is enabled, then the camera device
               will accurately report the values applied by AWB in the result.
@@ -4344,6 +4350,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
               In addition, the android.sync.maxLatency field is
               guaranted to have a value between 0 and 4, inclusive.
+              android.control.aeLockAvailable and
+              android.control.awbLockAvailable are also guaranteed
+              to be `true` so burst capture with these two locks ON
+              yields consistent image output.
+
               </notes>
             </value>
             <value optional="true">YUV_REPROCESSING