Snap for 10102166 from e5afae1ac280711711cb1e12c529b54ac41860e3 to mainline-tzdata4-release
Change-Id: I2b9af3077a0b56741204082d13404769f764244c
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index f4898bc..44bef14 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -8069,18 +8069,18 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center"></td>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device auto exposure algorithm is disabled</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device auto exposure algorithm is disabled</td>
</tr>
</tbody>
</table>
@@ -8088,120 +8088,120 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device initiates AE scan</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values changing</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device initiates AE scan</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values changing</td>
</tr>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">SEARCHING</td>
-<td align="center">Camera device finishes AE scan</td>
-<td align="center">CONVERGED</td>
-<td align="center">Good values,<wbr/> not changing</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Camera device finishes AE scan</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Good values,<wbr/> not changing</td>
</tr>
<tr>
-<td align="center">SEARCHING</td>
-<td align="center">Camera device finishes AE scan</td>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Converged but too dark w/<wbr/>o flash</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Camera device finishes AE scan</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Converged but too dark w/<wbr/>o flash</td>
</tr>
<tr>
-<td align="center">SEARCHING</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">CONVERGED</td>
-<td align="center">Camera device initiates AE scan</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values changing</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Camera device initiates AE scan</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values changing</td>
</tr>
<tr>
-<td align="center">CONVERGED</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Camera device initiates AE scan</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values changing</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Camera device initiates AE scan</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values changing</td>
</tr>
<tr>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values not good after unlock</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values not good after unlock</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
-<td align="center">CONVERGED</td>
-<td align="center">Values good after unlock</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Values good after unlock</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Exposure good,<wbr/> but too dark</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;"><a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Exposure good,<wbr/> but too dark</td>
</tr>
<tr>
-<td align="center">PRECAPTURE</td>
-<td align="center">Sequence done.<wbr/> <a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
-<td align="center">CONVERGED</td>
-<td align="center">Ready for high-quality capture</td>
+<td style="text-align: center;">PRECAPTURE</td>
+<td style="text-align: center;">Sequence done.<wbr/> <a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Ready for high-quality capture</td>
</tr>
<tr>
-<td align="center">PRECAPTURE</td>
-<td align="center">Sequence done.<wbr/> <a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Ready for high-quality capture</td>
+<td style="text-align: center;">PRECAPTURE</td>
+<td style="text-align: center;">Sequence done.<wbr/> <a href="#controls_android.control.aeLock">android.<wbr/>control.<wbr/>ae<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Ready for high-quality capture</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center">aeLock is ON and aePrecaptureTrigger is START</td>
-<td align="center">LOCKED</td>
-<td align="center">Precapture trigger is ignored when AE is already locked</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">aeLock is ON and aePrecaptureTrigger is START</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Precapture trigger is ignored when AE is already locked</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center">aeLock is ON and aePrecaptureTrigger is CANCEL</td>
-<td align="center">LOCKED</td>
-<td align="center">Precapture trigger is ignored when AE is already locked</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">aeLock is ON and aePrecaptureTrigger is CANCEL</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Precapture trigger is ignored when AE is already locked</td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START</td>
-<td align="center">PRECAPTURE</td>
-<td align="center">Start AE precapture metering sequence</td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START</td>
+<td style="text-align: center;">PRECAPTURE</td>
+<td style="text-align: center;">Start AE precapture metering sequence</td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Currently active precapture metering sequence is canceled</td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Currently active precapture metering sequence is canceled</td>
</tr>
</tbody>
</table>
@@ -8217,54 +8217,54 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device finished AE scan</td>
-<td align="center">CONVERGED</td>
-<td align="center">Values are already good,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device finished AE scan</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Values are already good,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START,<wbr/> sequence done</td>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Converged but too dark w/<wbr/>o flash after a precapture sequence,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START,<wbr/> sequence done</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Converged but too dark w/<wbr/>o flash after a precapture sequence,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START,<wbr/> sequence done</td>
-<td align="center">CONVERGED</td>
-<td align="center">Converged after a precapture sequence,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is START,<wbr/> sequence done</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Converged after a precapture sequence,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL,<wbr/> converged</td>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Converged but too dark w/<wbr/>o flash after a precapture sequence is canceled,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL,<wbr/> converged</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Converged but too dark w/<wbr/>o flash after a precapture sequence is canceled,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">Any state (excluding LOCKED)</td>
-<td align="center"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL,<wbr/> converged</td>
-<td align="center">CONVERGED</td>
-<td align="center">Converged after a precapture sequences canceled,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">Any state (excluding LOCKED)</td>
+<td style="text-align: center;"><a href="#controls_android.control.aePrecaptureTrigger">android.<wbr/>control.<wbr/>ae<wbr/>Precapture<wbr/>Trigger</a> is CANCEL,<wbr/> converged</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Converged after a precapture sequences canceled,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">CONVERGED</td>
-<td align="center">Camera device finished AE scan</td>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Converged but too dark w/<wbr/>o flash after a new scan,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Camera device finished AE scan</td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Converged but too dark w/<wbr/>o flash after a new scan,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">FLASH_<wbr/>REQUIRED</td>
-<td align="center">Camera device finished AE scan</td>
-<td align="center">CONVERGED</td>
-<td align="center">Converged after a new scan,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">FLASH_<wbr/>REQUIRED</td>
+<td style="text-align: center;">Camera device finished AE scan</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Converged after a new scan,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
</tbody>
</table>
@@ -8803,18 +8803,18 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center"></td>
-<td align="center">INACTIVE</td>
-<td align="center">Never changes</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Never changes</td>
</tr>
</tbody>
</table>
@@ -8822,66 +8822,66 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">Start AF sweep,<wbr/> Lens now moving</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF sweep,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">AF sweep done</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Focused,<wbr/> Lens now locked</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF sweep done</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Focused,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">AF sweep done</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Not focused,<wbr/> Lens now locked</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF sweep done</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Not focused,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Cancel/<wbr/>reset AF,<wbr/> Lens now locked</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Cancel/<wbr/>reset AF,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Cancel/<wbr/>reset AF</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Cancel/<wbr/>reset AF</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">Start new sweep,<wbr/> Lens now moving</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start new sweep,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Cancel/<wbr/>reset AF</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Cancel/<wbr/>reset AF</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">ACTIVE_<wbr/>SCAN</td>
-<td align="center">Start new sweep,<wbr/> Lens now moving</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">ACTIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start new sweep,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">Any state</td>
-<td align="center">Mode change</td>
-<td align="center">INACTIVE</td>
-<td align="center"></td>
+<td style="text-align: center;">Any state</td>
+<td style="text-align: center;">Mode change</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"></td>
</tr>
</tbody>
</table>
@@ -8894,36 +8894,36 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Focus is already good or good after a scan,<wbr/> lens is now locked.<wbr/></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Focus is already good or good after a scan,<wbr/> lens is now locked.<wbr/></td>
</tr>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Focus failed after a scan,<wbr/> lens is now locked.<wbr/></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Focus failed after a scan,<wbr/> lens is now locked.<wbr/></td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Focus is already good or good after a scan,<wbr/> lens is now locked.<wbr/></td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Focus is already good or good after a scan,<wbr/> lens is now locked.<wbr/></td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Focus is good after a scan,<wbr/> lens is not locked.<wbr/></td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Focus is good after a scan,<wbr/> lens is not locked.<wbr/></td>
</tr>
</tbody>
</table>
@@ -8931,102 +8931,102 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF state query,<wbr/> Lens now locked</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF state query,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Camera device completes current scan</td>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">End AF scan,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Camera device completes current scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">End AF scan,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Camera device fails current scan</td>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">End AF scan,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Camera device fails current scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">End AF scan,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate transition,<wbr/> if focus is good.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate transition,<wbr/> if focus is good.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate transition,<wbr/> if focus is bad.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate transition,<wbr/> if focus is bad.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Reset lens position,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Reset lens position,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate transition,<wbr/> lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate transition,<wbr/> lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate transition,<wbr/> lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate transition,<wbr/> lens now locked</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">No effect</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">No effect</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Restart AF scan</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Restart AF scan</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">No effect</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">No effect</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Restart AF scan</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Restart AF scan</td>
</tr>
</tbody>
</table>
@@ -9034,102 +9034,102 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF state query,<wbr/> Lens now locked</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF state query,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Camera device completes current scan</td>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">End AF scan,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Camera device completes current scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">End AF scan,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Camera device fails current scan</td>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">End AF scan,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Camera device fails current scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">End AF scan,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Eventual transition once the focus is good.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Eventual transition once the focus is good.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Eventual transition if cannot find focus.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Eventual transition if cannot find focus.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Reset lens position,<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Reset lens position,<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">Camera device initiates new scan</td>
-<td align="center">PASSIVE_<wbr/>SCAN</td>
-<td align="center">Start AF scan,<wbr/> Lens now moving</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">Camera device initiates new scan</td>
+<td style="text-align: center;">PASSIVE_<wbr/>SCAN</td>
+<td style="text-align: center;">Start AF scan,<wbr/> Lens now moving</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>FOCUSED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate trans.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>FOCUSED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate trans.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">PASSIVE_<wbr/>UNFOCUSED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">Immediate trans.<wbr/> Lens now locked</td>
+<td style="text-align: center;">PASSIVE_<wbr/>UNFOCUSED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">Immediate trans.<wbr/> Lens now locked</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">No effect</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">No effect</td>
</tr>
<tr>
-<td align="center">FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Restart AF scan</td>
+<td style="text-align: center;">FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Restart AF scan</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>TRIGGER</td>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">No effect</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">No effect</td>
</tr>
<tr>
-<td align="center">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
-<td align="center">AF_<wbr/>CANCEL</td>
-<td align="center">INACTIVE</td>
-<td align="center">Restart AF scan</td>
+<td style="text-align: center;">NOT_<wbr/>FOCUSED_<wbr/>LOCKED</td>
+<td style="text-align: center;">AF_<wbr/>CANCEL</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Restart AF scan</td>
</tr>
</tbody>
</table>
@@ -9141,30 +9141,30 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">any state</td>
-<td align="center">CAF-->AUTO mode switch</td>
-<td align="center">INACTIVE</td>
-<td align="center">Mode switch without trigger,<wbr/> initial state must be INACTIVE</td>
+<td style="text-align: center;">any state</td>
+<td style="text-align: center;">CAF-->AUTO mode switch</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Mode switch without trigger,<wbr/> initial state must be INACTIVE</td>
</tr>
<tr>
-<td align="center">any state</td>
-<td align="center">CAF-->AUTO mode switch with AF_<wbr/>TRIGGER</td>
-<td align="center">trigger-reachable states from INACTIVE</td>
-<td align="center">Mode switch with trigger,<wbr/> INACTIVE is skipped</td>
+<td style="text-align: center;">any state</td>
+<td style="text-align: center;">CAF-->AUTO mode switch with AF_<wbr/>TRIGGER</td>
+<td style="text-align: center;">trigger-reachable states from INACTIVE</td>
+<td style="text-align: center;">Mode switch with trigger,<wbr/> INACTIVE is skipped</td>
</tr>
<tr>
-<td align="center">any state</td>
-<td align="center">AUTO-->CAF mode switch</td>
-<td align="center">passively reachable states from INACTIVE</td>
-<td align="center">Mode switch without trigger,<wbr/> passive transient state is skipped</td>
+<td style="text-align: center;">any state</td>
+<td style="text-align: center;">AUTO-->CAF mode switch</td>
+<td style="text-align: center;">passively reachable states from INACTIVE</td>
+<td style="text-align: center;">Mode switch without trigger,<wbr/> passive transient state is skipped</td>
</tr>
</tbody>
</table>
@@ -9842,18 +9842,18 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center"></td>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device auto white balance algorithm is disabled</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device auto white balance algorithm is disabled</td>
</tr>
</tbody>
</table>
@@ -9861,54 +9861,54 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device initiates AWB scan</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values changing</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device initiates AWB scan</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values changing</td>
</tr>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">SEARCHING</td>
-<td align="center">Camera device finishes AWB scan</td>
-<td align="center">CONVERGED</td>
-<td align="center">Good values,<wbr/> not changing</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Camera device finishes AWB scan</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Good values,<wbr/> not changing</td>
</tr>
<tr>
-<td align="center">SEARCHING</td>
-<td align="center"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">CONVERGED</td>
-<td align="center">Camera device initiates AWB scan</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values changing</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Camera device initiates AWB scan</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values changing</td>
</tr>
<tr>
-<td align="center">CONVERGED</td>
-<td align="center"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
-<td align="center">LOCKED</td>
-<td align="center">Values locked</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is ON</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;">Values locked</td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is OFF</td>
-<td align="center">SEARCHING</td>
-<td align="center">Values not good after unlock</td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">SEARCHING</td>
+<td style="text-align: center;">Values not good after unlock</td>
</tr>
</tbody>
</table>
@@ -9921,24 +9921,24 @@
<table>
<thead>
<tr>
-<th align="center">State</th>
-<th align="center">Transition Cause</th>
-<th align="center">New State</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">State</th>
+<th style="text-align: center;">Transition Cause</th>
+<th style="text-align: center;">New State</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">INACTIVE</td>
-<td align="center">Camera device finished AWB scan</td>
-<td align="center">CONVERGED</td>
-<td align="center">Values are already good,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">INACTIVE</td>
+<td style="text-align: center;">Camera device finished AWB scan</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Values are already good,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
<tr>
-<td align="center">LOCKED</td>
-<td align="center"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is OFF</td>
-<td align="center">CONVERGED</td>
-<td align="center">Values good after unlock,<wbr/> transient states are skipped by camera device.<wbr/></td>
+<td style="text-align: center;">LOCKED</td>
+<td style="text-align: center;"><a href="#controls_android.control.awbLock">android.<wbr/>control.<wbr/>awb<wbr/>Lock</a> is OFF</td>
+<td style="text-align: center;">CONVERGED</td>
+<td style="text-align: center;">Values good after unlock,<wbr/> transient states are skipped by camera device.<wbr/></td>
</tr>
</tbody>
</table>
@@ -19223,24 +19223,25 @@
camera's crop region is set to maximum size,<wbr/> the FOV of the physical streams for the
ultrawide lens will be the same as the logical stream,<wbr/> by making the crop region
smaller than its active array size to compensate for the smaller focal length.<wbr/></p>
-<p>There are two ways for the application to capture RAW images from a logical camera
-with RAW capability:</p>
+<p>For a logical camera,<wbr/> typically the underlying physical cameras have different RAW
+capabilities (such as resolution or CFA pattern).<wbr/> There are two ways for the
+application to capture RAW images from the logical camera:</p>
<ul>
-<li>Because the underlying physical cameras may have different RAW capabilities (such
-as resolution or CFA pattern),<wbr/> to maintain backward compatibility,<wbr/> when a RAW stream
-is configured,<wbr/> the camera device makes sure the default active physical camera remains
-active and does not switch to other physical cameras.<wbr/> (One exception is that,<wbr/> if the
-logical camera consists of identical image sensors and advertises multiple focalLength
-due to different lenses,<wbr/> the camera device may generate RAW images from different
-physical cameras based on the focalLength being set by the application.<wbr/>) This
-backward-compatible approach usually results in loss of optical zoom,<wbr/> to telephoto
-lens or to ultrawide lens.<wbr/></li>
-<li>Alternatively,<wbr/> to take advantage of the full zoomRatio range of the logical camera,<wbr/>
-the application should use <a href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html">MultiResolutionImageReader</a>
-to capture RAW images from the currently active physical camera.<wbr/> Because different
-physical camera may have different RAW characteristics,<wbr/> the application needs to use
-the characteristics and result metadata of the active physical camera for the
-relevant RAW metadata.<wbr/></li>
+<li>If the logical camera has RAW capability,<wbr/> the application can create and use RAW
+streams in the same way as before.<wbr/> In case a RAW stream is configured,<wbr/> to maintain
+backward compatibility,<wbr/> the camera device makes sure the default active physical
+camera remains active and does not switch to other physical cameras.<wbr/> (One exception
+is that,<wbr/> if the logical camera consists of identical image sensors and advertises
+multiple focalLength due to different lenses,<wbr/> the camera device may generate RAW
+images from different physical cameras based on the focalLength being set by the
+application.<wbr/>) This backward-compatible approach usually results in loss of optical
+zoom,<wbr/> to telephoto lens or to ultrawide lens.<wbr/></li>
+<li>Alternatively,<wbr/> if supported by the device,<wbr/>
+<a href="https://developer.android.com/reference/android/hardware/camera2/MultiResolutionImageReader.html">MultiResolutionImageReader</a>
+can be used to capture RAW images from one of the underlying physical cameras (
+depending on current zoom level).<wbr/> Because different physical cameras may have
+different RAW characteristics,<wbr/> the application needs to use the characteristics
+and result metadata of the active physical camera for the relevant RAW metadata.<wbr/></li>
</ul>
<p>The capture request and result metadata tags required for backward compatible camera
functionalities will be solely based on the logical camera capability.<wbr/> On the other
@@ -21906,31 +21907,31 @@
<table>
<thead>
<tr>
-<th align="left">Input Format</th>
-<th align="left">Output Format</th>
-<th align="left">Capability</th>
+<th style="text-align: left;">Input Format</th>
+<th style="text-align: left;">Output Format</th>
+<th style="text-align: left;">Capability</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
-<td align="left">PRIVATE_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: left;">PRIVATE_<wbr/>REPROCESSING</td>
</tr>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="left">PRIVATE_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: left;">PRIVATE_<wbr/>REPROCESSING</td>
</tr>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
-<td align="left">YUV_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: left;">YUV_<wbr/>REPROCESSING</td>
</tr>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="left">YUV_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: left;">YUV_<wbr/>REPROCESSING</td>
</tr>
</tbody>
</table>
@@ -21947,26 +21948,26 @@
<table>
<thead>
<tr>
-<th align="left">Input Format</th>
-<th align="left">Output Format</th>
-<th align="left">Capability</th>
+<th style="text-align: left;">Input Format</th>
+<th style="text-align: left;">Output Format</th>
+<th style="text-align: left;">Capability</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
-<td align="left">PRIVATE_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
+<td style="text-align: left;">PRIVATE_<wbr/>REPROCESSING</td>
</tr>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
-<td align="left">YUV_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: left;">YUV_<wbr/>REPROCESSING</td>
</tr>
<tr>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
-<td align="left"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
-<td align="left">YUV_<wbr/>REPROCESSING</td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
+<td style="text-align: left;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#Y8">ImageFormat#Y8</a></td>
+<td style="text-align: left;">YUV_<wbr/>REPROCESSING</td>
</tr>
</tbody>
</table>
@@ -22096,60 +22097,60 @@
<table>
<thead>
<tr>
-<th align="center">Format</th>
-<th align="center">Size</th>
-<th align="center">Hardware Level</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">Format</th>
+<th style="text-align: center;">Size</th>
+<th style="text-align: center;">Hardware Level</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">JPEG</td>
-<td align="center"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">JPEG</td>
-<td align="center">1920x1080 (1080p)</td>
-<td align="center">Any</td>
-<td align="center">if 1080p <= activeArraySize</td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">JPEG</td>
-<td align="center">1280x720 (720)</td>
-<td align="center">Any</td>
-<td align="center">if 720p <= activeArraySize</td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;">1280x720 (720)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 720p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">JPEG</td>
-<td align="center">640x480 (480p)</td>
-<td align="center">Any</td>
-<td align="center">if 480p <= activeArraySize</td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;">640x480 (480p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 480p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">JPEG</td>
-<td align="center">320x240 (240p)</td>
-<td align="center">Any</td>
-<td align="center">if 240p <= activeArraySize</td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;">320x240 (240p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 240p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">all output sizes available for JPEG</td>
-<td align="center">FULL</td>
-<td align="center"></td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">all output sizes available for JPEG</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">all output sizes available for JPEG,<wbr/> up to the maximum video size</td>
-<td align="center">LIMITED</td>
-<td align="center"></td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">all output sizes available for JPEG,<wbr/> up to the maximum video size</td>
+<td style="text-align: center;">LIMITED</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">IMPLEMENTATION_<wbr/>DEFINED</td>
-<td align="center">same as YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;">IMPLEMENTATION_<wbr/>DEFINED</td>
+<td style="text-align: center;">same as YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
</tbody>
</table>
@@ -22164,66 +22165,66 @@
<table>
<thead>
<tr>
-<th align="center">Format</th>
-<th align="center">Size</th>
-<th align="center">Hardware Level</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">Format</th>
+<th style="text-align: center;">Size</th>
+<th style="text-align: center;">Hardware Level</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center">JPEG</td>
-<td align="center"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">JPEG</td>
-<td align="center">1920x1080 (1080p)</td>
-<td align="center">Any</td>
-<td align="center">if 1080p <= activeArraySize</td>
+<td style="text-align: center;">JPEG</td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
-<td align="center">FULL</td>
-<td align="center"></td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">1920x1080 (1080p)</td>
-<td align="center">FULL</td>
-<td align="center">if 1080p <= activeArraySize</td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">1280x720 (720)</td>
-<td align="center">FULL</td>
-<td align="center">if 720p <= activeArraySize</td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">1280x720 (720)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 720p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">640x480 (480p)</td>
-<td align="center">FULL</td>
-<td align="center">if 480p <= activeArraySize</td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">640x480 (480p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 480p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">320x240 (240p)</td>
-<td align="center">FULL</td>
-<td align="center">if 240p <= activeArraySize</td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">320x240 (240p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 240p <= activeArraySize</td>
</tr>
<tr>
-<td align="center">YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">all output sizes available for FULL hardware level,<wbr/> up to the maximum video size</td>
-<td align="center">LIMITED</td>
-<td align="center"></td>
+<td style="text-align: center;">YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">all output sizes available for FULL hardware level,<wbr/> up to the maximum video size</td>
+<td style="text-align: center;">LIMITED</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center">IMPLEMENTATION_<wbr/>DEFINED</td>
-<td align="center">same as YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;">IMPLEMENTATION_<wbr/>DEFINED</td>
+<td style="text-align: center;">same as YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
</tbody>
</table>
@@ -22550,17 +22551,67 @@
check if it limits the maximum size for image data.<wbr/></p>
<p>For applications targeting SDK version older than 31,<wbr/> the following table
describes the minimum required output stream configurations based on the
-hardware level (<a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a>):
-Format |<wbr/> Size |<wbr/> Hardware Level |<wbr/> Notes
-:-------------------------------------------------:|<wbr/>:--------------------------------------------:|<wbr/>:--------------:|<wbr/>:--------------:
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a> |<wbr/> <a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> (*1) |<wbr/> Any |<wbr/>
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a> |<wbr/> 1920x1080 (1080p) |<wbr/> Any |<wbr/> if 1080p <= activeArraySize
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a> |<wbr/> 1280x720 (720p) |<wbr/> Any |<wbr/> if 720p <= activeArraySize
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a> |<wbr/> 640x480 (480p) |<wbr/> Any |<wbr/> if 480p <= activeArraySize
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a> |<wbr/> 320x240 (240p) |<wbr/> Any |<wbr/> if 240p <= activeArraySize
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a> |<wbr/> all output sizes available for JPEG |<wbr/> FULL |<wbr/>
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a> |<wbr/> all output sizes available for JPEG,<wbr/> up to the maximum video size |<wbr/> LIMITED |<wbr/>
-<a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a> |<wbr/> same as YUV_<wbr/>420_<wbr/>888 |<wbr/> Any |<wbr/></p>
+hardware level (<a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a>):</p>
+<table>
+<thead>
+<tr>
+<th style="text-align: center;">Format</th>
+<th style="text-align: center;">Size</th>
+<th style="text-align: center;">Hardware Level</th>
+<th style="text-align: center;">Notes</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> (*1)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;">1280x720 (720p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 720p <= activeArraySize</td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;">640x480 (480p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 480p <= activeArraySize</td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;">320x240 (240p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 240p <= activeArraySize</td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">all output sizes available for JPEG</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;"></td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">all output sizes available for JPEG,<wbr/> up to the maximum video size</td>
+<td style="text-align: center;">LIMITED</td>
+<td style="text-align: center;"></td>
+</tr>
+<tr>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
+<td style="text-align: center;">same as YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
+</tr>
+</tbody>
+</table>
<p>For applications targeting SDK version 31 or newer,<wbr/> if the mobile device declares to be
media performance class 12 or higher by setting
<a href="https://developer.android.com/reference/android/os/Build.VERSION.html#MEDIA_PERFORMANCE_CLASS">VERSION#MEDIA_<wbr/>PERFORMANCE_<wbr/>CLASS</a> to be 31 or larger,<wbr/>
@@ -22572,66 +22623,66 @@
<table>
<thead>
<tr>
-<th align="center">Format</th>
-<th align="center">Size</th>
-<th align="center">Hardware Level</th>
-<th align="center">Notes</th>
+<th style="text-align: center;">Format</th>
+<th style="text-align: center;">Size</th>
+<th style="text-align: center;">Hardware Level</th>
+<th style="text-align: center;">Notes</th>
</tr>
</thead>
<tbody>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
-<td align="center"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> (*1)</td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a> (*1)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
-<td align="center">1920x1080 (1080p)</td>
-<td align="center">Any</td>
-<td align="center">if 1080p <= activeArraySize</td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#JPEG">ImageFormat#JPEG</a></td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
-<td align="center">FULL</td>
-<td align="center"></td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;"><a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a></td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center">1920x1080 (1080p)</td>
-<td align="center">FULL</td>
-<td align="center">if 1080p <= activeArraySize</td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">1920x1080 (1080p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 1080p <= activeArraySize</td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center">1280x720 (720)</td>
-<td align="center">FULL</td>
-<td align="center">if 720p <= activeArraySize</td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">1280x720 (720)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 720p <= activeArraySize</td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center">640x480 (480p)</td>
-<td align="center">FULL</td>
-<td align="center">if 480p <= activeArraySize</td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">640x480 (480p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 480p <= activeArraySize</td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center">320x240 (240p)</td>
-<td align="center">FULL</td>
-<td align="center">if 240p <= activeArraySize</td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">320x240 (240p)</td>
+<td style="text-align: center;">FULL</td>
+<td style="text-align: center;">if 240p <= activeArraySize</td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
-<td align="center">all output sizes available for FULL hardware level,<wbr/> up to the maximum video size</td>
-<td align="center">LIMITED</td>
-<td align="center"></td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#YUV_420_888">Image<wbr/>Format#YUV_<wbr/>420_<wbr/>888</a></td>
+<td style="text-align: center;">all output sizes available for FULL hardware level,<wbr/> up to the maximum video size</td>
+<td style="text-align: center;">LIMITED</td>
+<td style="text-align: center;"></td>
</tr>
<tr>
-<td align="center"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
-<td align="center">same as YUV_<wbr/>420_<wbr/>888</td>
-<td align="center">Any</td>
-<td align="center"></td>
+<td style="text-align: center;"><a href="https://developer.android.com/reference/android/graphics/ImageFormat.html#PRIVATE">ImageFormat#PRIVATE</a></td>
+<td style="text-align: center;">same as YUV_<wbr/>420_<wbr/>888</td>
+<td style="text-align: center;">Any</td>
+<td style="text-align: center;"></td>
</tr>
</tbody>
</table>
@@ -23963,7 +24014,7 @@
<p>An array of mandatory stream combinations which are applicable when device support the
10-bit output capability
<a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT">Camera<wbr/>Characteristics#REQUEST_<wbr/>AVAILABLE_<wbr/>CAPABILITIES_<wbr/>DYNAMIC_<wbr/>RANGE_<wbr/>TEN_<wbr/>BIT</a>
-This is an app-readable conversion of the maximum resolution mandatory stream combination
+This is an app-readable conversion of the 10 bit output mandatory stream combination
<a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">tables</a>.<wbr/></p>
</td>
@@ -24040,8 +24091,8 @@
<td class="entry_description">
<p>An array of mandatory stream combinations which are applicable when device lists
{@code PREVIEW_<wbr/>STABILIZATION} in <a href="#static_android.control.availableVideoStabilizationModes">android.<wbr/>control.<wbr/>available<wbr/>Video<wbr/>Stabilization<wbr/>Modes</a>.<wbr/>
-This is an app-readable conversion of the maximum resolution mandatory stream combination
-<a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">tables</a>.<wbr/></p>
+This is an app-readable conversion of the preview stabilization mandatory stream
+combination <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#createCaptureSession">tables</a>.<wbr/></p>
</td>
<td class="entry_units">
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index bd23135..10f997d 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -6117,24 +6117,25 @@
ultrawide lens will be the same as the logical stream, by making the crop region
smaller than its active array size to compensate for the smaller focal length.
- There are two ways for the application to capture RAW images from a logical camera
- with RAW capability:
+ For a logical camera, typically the underlying physical cameras have different RAW
+ capabilities (such as resolution or CFA pattern). There are two ways for the
+ application to capture RAW images from the logical camera:
- * Because the underlying physical cameras may have different RAW capabilities (such
- as resolution or CFA pattern), to maintain backward compatibility, when a RAW stream
- is configured, the camera device makes sure the default active physical camera remains
- active and does not switch to other physical cameras. (One exception is that, if the
- logical camera consists of identical image sensors and advertises multiple focalLength
- due to different lenses, the camera device may generate RAW images from different
- physical cameras based on the focalLength being set by the application.) This
- backward-compatible approach usually results in loss of optical zoom, to telephoto
- lens or to ultrawide lens.
- * Alternatively, to take advantage of the full zoomRatio range of the logical camera,
- the application should use {@link android.hardware.camera2.MultiResolutionImageReader}
- to capture RAW images from the currently active physical camera. Because different
- physical camera may have different RAW characteristics, the application needs to use
- the characteristics and result metadata of the active physical camera for the
- relevant RAW metadata.
+ * If the logical camera has RAW capability, the application can create and use RAW
+ streams in the same way as before. In case a RAW stream is configured, to maintain
+ backward compatibility, the camera device makes sure the default active physical
+ camera remains active and does not switch to other physical cameras. (One exception
+ is that, if the logical camera consists of identical image sensors and advertises
+ multiple focalLength due to different lenses, the camera device may generate RAW
+ images from different physical cameras based on the focalLength being set by the
+ application.) This backward-compatible approach usually results in loss of optical
+ zoom, to telephoto lens or to ultrawide lens.
+ * Alternatively, if supported by the device,
+ {@link android.hardware.camera2.MultiResolutionImageReader}
+ can be used to capture RAW images from one of the underlying physical cameras (
+ depending on current zoom level). Because different physical cameras may have
+ different RAW characteristics, the application needs to use the characteristics
+ and result metadata of the active physical camera for the relevant RAW metadata.
The capture request and result metadata tags required for backward compatible camera
functionalities will be solely based on the logical camera capability. On the other
@@ -7677,6 +7678,7 @@
For applications targeting SDK version older than 31, the following table
describes the minimum required output stream configurations based on the
hardware level (android.info.supportedHardwareLevel):
+
Format | Size | Hardware Level | Notes
:-------------------------------------------------:|:--------------------------------------------:|:--------------:|:--------------:
{@link android.graphics.ImageFormat#JPEG} | android.sensor.info.activeArraySize (*1) | Any |
@@ -8514,7 +8516,7 @@
An array of mandatory stream combinations which are applicable when device support the
10-bit output capability
{@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT}
- This is an app-readable conversion of the maximum resolution mandatory stream combination
+ This is an app-readable conversion of the 10 bit output mandatory stream combination
{@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.
</description>
<details>
@@ -8545,8 +8547,8 @@
<description>
An array of mandatory stream combinations which are applicable when device lists
{@code PREVIEW_STABILIZATION} in android.control.availableVideoStabilizationModes.
- This is an app-readable conversion of the maximum resolution mandatory stream combination
- {@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.
+ This is an app-readable conversion of the preview stabilization mandatory stream
+ combination {@link android.hardware.camera2.CameraDevice#createCaptureSession tables}.
</description>
<details>
The array of
