Docs: Changes to source.android.com

  - 209604809 Add note about dm-verity for low-ram devices where it onl... by Danielle Roberts <daroberts@google.com>
  - 209604691 Update August acknowledgements for CVE-2018-9441 by Danielle Roberts <daroberts@google.com>
  - 209486466 Add LEVEL_3 to Camera versioning by Kenneth Lau <kennethlau@google.com>
  - 209486462 CL to update external severity ratings to the v6 severity... by Android Partner Docs <noreply@android.com>
  - 209444238 Update _translation.yaml to exclude 2018 bulletins by Danielle Roberts <daroberts@google.com>
  - 209427959 Add arrow icon to external links in lists by Kenneth Lau <kennethlau@google.com>
  - 209424658 Devsite localized content from translation request 968451. by Android Partner Docs <noreply@android.com>
  - 209424637 Devsite localized content from translation request 968450. by Android Partner Docs <noreply@android.com>
  - 209424628 Devsite localized content from translation request 966380. by Android Partner Docs <noreply@android.com>
  - 209424625 Devsite localized content from translation request 964306. by Android Partner Docs <noreply@android.com>
  - 209267798 Replaces gendered pronouns by a gender-neutral alternative. by Android Partner Docs <noreply@android.com>
  - 209227647 Devsite localized content from translation request 965625. by Android Partner Docs <noreply@android.com>
  - 209227634 Devsite localized content from translation request 957852. by Android Partner Docs <noreply@android.com>
  - 209212984 Adding additional kernel configs by Heidi von Markham <hvm@google.com>
  - 209202145 Fix typo by Kenneth Lau <kennethlau@google.com>
  - 209200899 Change to external links by Kenneth Lau <kennethlau@google.com>
  - 209199945 Add links to Wi-Fi Infrastructure Features by Kenneth Lau <kennethlau@google.com>
  - 209197210 Update BiometricPrompt architecture diagram by Danielle Roberts <daroberts@google.com>
  - 209175201 Add missing method handle types to dex-format.html by Android Partner Docs <noreply@android.com>
  - 209168733 Fix formatting issues by Kenneth Lau <kennethlau@google.com>
  - 209045992 Remove "" typo that's causing localization to break by Danielle Roberts <daroberts@google.com>
  - 209045924 Remove "" typo that's causing localization to fail by Danielle Roberts <daroberts@google.com>
  - 209045830 Update header id that's causing localization failures by Danielle Roberts <daroberts@google.com>
  - 209042219 Update documentation for no more static java libraries. by Android Partner Docs <noreply@android.com>
  - 209031438 Remove previously redirected landing pages by Clay Murphy <claym@google.com>
  - 209023482 Add a additional kernel requirement information for eBPF ... by Android Partner Docs <noreply@android.com>
  - 209011451 Clarify documentation on conventions for method overloadi... by Android Partner Docs <noreply@android.com>
  - 208971152 Create a BLE for Hearing Aids page on SAC. by Christina Nguyen <cqn@google.com>
  - 208933222 Add "Matching AVB Version during OTA" section. by Android Partner Docs <noreply@android.com>
  - 208891110 Update correct version for CTS 7.0_r24. Wrong version was... by Android Partner Docs <noreply@android.com>
  - 208878378 Update CTS/CTS-Verifier downloads for CTS-Aug-2018 Releas... by Android Partner Docs <noreply@android.com>
  - 208855756 Devsite localized content from translation request 965636. by Android Partner Docs <noreply@android.com>
  - 208855746 Devsite localized content from translation request 964314. by Android Partner Docs <noreply@android.com>
  - 208738524 Add version information by Kenneth Lau <kennethlau@google.com>
  - 208733023 Update security researcher acknowledgements by Danielle Roberts <daroberts@google.com>
  - 208724203 Fix changelog links, messed up in last errata run. by Gina Dimino <gdimino@google.com>
  - 208723122 Add missing word "Android" by Android Partner Docs <noreply@android.com>
  - 208700832 Devsite localized content from translation request 954736. by Android Partner Docs <noreply@android.com>
  - 208688134 Devsite localized content from translation request 960242. by Android Partner Docs <noreply@android.com>
  - 208688127 Devsite localized content from translation request 952102. by Android Partner Docs <noreply@android.com>
  - 208672491 Fix file paths in immediate directory that were broken by... by Christina Nguyen <cqn@google.com>
  - 208571761 Add Wi-Fi Infrastructure Features document by Kenneth Lau <kennethlau@google.com>

PiperOrigin-RevId: 209604809
Change-Id: If554e158c7c400736ca7722cce279231a53e0933

2 files changed, 34 insertions, 1 deletions

diff --git a/en/devices/architecture/vintf/dm.html b/en/devices/architecture/vintf/dm.html
index 091094dc..28884749 100644
--- a/en/devices/architecture/vintf/dm.html
+++ b/en/devices/architecture/vintf/dm.html
@@ -126,7 +126,7 @@ with. To bump the Target FCM Version of a device, vendors need to:</p>
 <li>Modify HAL Versions in the device manifest file.</li>
 <li>Modify the Target FCM Version in the device manifest file.</li>
 <li>Remove deprecated HAL versions.</li>
-<li>For devices launched with {{ androidPVersionNumber }} or older, cherry-pick
+<li>For devices launched with Android {{ androidPVersionNumber }} or lower, cherry-pick
 these CLs before generating OTA update packages:
   <ul>
     <li><a href="https://android-review.googlesource.com/722283">CL 722283</a></li>
diff --git a/en/devices/architecture/vintf/match-rules.html b/en/devices/architecture/vintf/match-rules.html
index dd79254b..b34b2190 100644
--- a/en/devices/architecture/vintf/match-rules.html
+++ b/en/devices/architecture/vintf/match-rules.html
@@ -4,6 +4,7 @@
     <meta name="project_path" value="/_project.yaml" />
     <meta name="book_path" value="/_book.yaml" />
   </head>
+  {% include "_versions.html" %}
   <body>
   <!--
       Copyright 2017 The Android Open Source Project
@@ -390,6 +391,38 @@ ro.boot.avb_version              == 2.3 &amp;&amp;
 ro.boot.vbmeta.avb_version       == 2.1 <font style="font-family: Roboto, Arial, Helvetica, sans-serif; background-color: green; color: white">&nbsp;match&nbsp;</font>
 </pre>
 
+<h3 id="avb-version-ota">Matching AVB version during OTA</h3>
+<p>For devices launched with Android {{ androidPVersionNumber }} or lower, during OTA, the AVB
+version requirements in framework compatibility matrix are matched against the current AVB version
+on the device. If the AVB version has an major version upgrade during an OTA (for example, from
+0.0 to 1.0), the check in OTA does not reflect the compatibility after the OTA.</p>
+<p>To mitigate the issue, an OEM can place a fake AVB version in the OTA package
+(<code>compatibility.zip</code>) to pass the check. To do so:</p>
+<ol>
+<li>Cherry-pick the following CLs to the Android {{ androidPVersionNumber }} source tree:
+<ul>
+  <li><a href="https://android-review.googlesource.com/732261" class="external">CL 732261</a></li>
+  <li><a href="https://android-review.googlesource.com/732262" class="external">CL 732262</a></li>
+</ul>
+</li>
+<li>Define <code>BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE</code> for the device. Its value
+should equal the AVB version before the OTA, i.e. the AVB version of the device when it was
+launched.</li>
+<li>Rebuild the OTA package.</li>
+</ol>
+<p>These changes automatically place
+<code>BOARD_OTA_FRAMEWORK_VBMETA_VERSION_OVERRIDE</code> as
+<code>compatibility-matrix.avb.vbmeta-version</code> in the following files:
+<ul>
+  <li><code>/system/compatibility_matrix.xml</code>
+  (which is not used in Android {{ androidPVersionNumber }}) on the device</li>
+  <li><code>system_matrix.xml</code> in <code>compatibility.zip</code> in the OTA package</li>
+</ul>
+These changes do not affect other framework compatibility matrices, including
+<code>/system/etc/vintf/compatibility_matrix.xml</code>. After the OTA, the new value in
+<code>/system/etc/vintf/compatibility_matrix.xml</code> is used for compatibility checks instead.
+</p>
+
 <h2 id="vndk">VNDK version matches</h2>
 <p>The device compatibility matrix declares the required VNDK version in
 <code>compatibility-matrix.vendor-ndk.version</code>. If the device