Docs: Changes to source.android.com

  - 220816688 Devsite localized content from translation request 1008214. by Android Partner Docs <noreply@android.com>
  - 220816664 Devsite localized content from translation request 1013270. by Android Partner Docs <noreply@android.com>
  - 220816636 Devsite localized content from translation request 1013272. by Android Partner Docs <noreply@android.com>
  - 220816628 Devsite localized content from translation request 1014969. by Android Partner Docs <noreply@android.com>
  - 220815612 Fix CVE reference for CVE-2017-1000112 by Android Partner Docs <noreply@android.com>
  - 220713007 Edit text, distinguish between simple and complex setup, ... by Clay Murphy <claym@google.com>
  - 220702656 Document default Java getService behavior. by Android Partner Docs <noreply@android.com>
  - 220485453 Update docs for ODM manifest overriding vendor manifest. by Android Partner Docs <noreply@android.com>
  - 220485175 Devsite localized content from translation request 1012616. by Android Partner Docs <noreply@android.com>
  - 220485126 Devsite localized content from translation request 964305. by Android Partner Docs <noreply@android.com>
  - 220485102 Devsite localized content from translation request 1009438. by Android Partner Docs <noreply@android.com>
  - 220485097 Devsite localized content from translation request 1012331. by Android Partner Docs <noreply@android.com>
  - 220346894 Adding GSI details for app developers and device complian... by Heidi von Markham <hvm@google.com>
  - 220346865 Updated the Index.yaml file by Android Partner Docs <noreply@android.com>
  - 220316234 Adding AOSP links to 2018-11-01.html by Android Partner Docs <noreply@android.com>
  - 220310886 Fix broken link on advisory page by Danielle Roberts <daroberts@google.com>
  - 220291759 Devsite localized content from translation request 997229. by Android Partner Docs <noreply@android.com>
  - 220291718 Devsite localized content from translation request 1009639. by Android Partner Docs <noreply@android.com>
  - 220291707 Devsite localized content from translation request 1010359. by Android Partner Docs <noreply@android.com>
  - 220289357 Add tags for OPM7.181105.004 (angler/bullhead), OPM8.1811... by Android Partner Docs <noreply@android.com>
  - 220197576 Update WFoV assembly box to 2.7 by Kenneth Lau <kennethlau@google.com>
  - 220193030 Change Input overview title by Danielle Roberts <daroberts@google.com>
  - 220174571 Updated HTC components table by Android Partner Docs <noreply@android.com>
  - 220124279 November 2018 bulletins by Danielle Roberts <daroberts@google.com>
  - 220118829 Devsite localized content from translation request 1012605. by Android Partner Docs <noreply@android.com>
  - 219944386 Update ASHA CoC spec. based on feedback from Oticon and i... by Android Partner Docs <noreply@android.com>
  - 219852814 Mention Soong on home page by Clay Murphy <claym@google.com>
  - 219843976 Devsite localized content from translation request 1007156. by Android Partner Docs <noreply@android.com>
  - 219827948 Fix some html style issue. by Android Partner Docs <noreply@android.com>
  - 219823685 Devsite localized content from translation request 1001117. by Android Partner Docs <noreply@android.com>
  - 219738856 Fix reference to Soong introduction in Android version by Clay Murphy <claym@google.com>
  - 219733022 Add a bullentin column to release numbers by Android Partner Docs <noreply@android.com>
  - 219707540 Move testing docs from AOSP to SAC proper by Clay Murphy <claym@google.com>
  - 219701714 Devsite localized content from translation request 1010885. by Android Partner Docs <noreply@android.com>
  - 219675967 Hello, this changelist shows a new page called 'Codelab a... by Android Partner Docs <noreply@android.com>
  - 219615108 Added note that OTA clients must notify DPCs about OTA st... by Android Partner Docs <noreply@android.com>
  - 219525544 Fixed the Trusty API Reference link from by Android Partner Docs <noreply@android.com>
  - 219491359 Devsite localized content from translation request 1008378. by Android Partner Docs <noreply@android.com>
  - 219351557 Fix links to manifest-format.md by Android Partner Docs <noreply@android.com>
  - 219338673 Update documentation for file-based encryption by Android Partner Docs <noreply@android.com>
  - 219306017 Devsite localized content from translation request 1010762. by Android Partner Docs <noreply@android.com>
  - 219306010 Devsite localized content from translation request 1007340. by Android Partner Docs <noreply@android.com>
  - 219305976 Devsite localized content from translation request 1010760. by Android Partner Docs <noreply@android.com>
  - 219305971 Devsite localized content from translation request 1007769. by Android Partner Docs <noreply@android.com>
  - 219305969 Devsite localized content from translation request 1001106. by Android Partner Docs <noreply@android.com>
  - 219163709 Update our Android Severity webpage to clarify that Insta... by Android Partner Docs <noreply@android.com>
  - 219161004 Devsite localized content from translation request 1009631. by Android Partner Docs <noreply@android.com>
  - 219160993 Devsite localized content from translation request 1009414. by Android Partner Docs <noreply@android.com>
  - 219160986 Devsite localized content from translation request 980845. by Android Partner Docs <noreply@android.com>
  - 218920762 Change examples from /data/misc/media* to /data/misc/audi... by Christina Nguyen <cqn@google.com>
  - 218917538 Update the description of fastboot to the correct behavior. by Christina Nguyen <cqn@google.com>

PiperOrigin-RevId: 220816688
Change-Id: Ifd1ceca1330d6c1f951fa5d7b2da571c95cd212b

2 files changed, 45 insertions, 4 deletions

diff --git a/en/devices/architecture/hidl-java/index.html b/en/devices/architecture/hidl-java/index.html
index d56fd1cc..f98d1b64 100644
--- a/en/devices/architecture/hidl-java/index.html
+++ b/en/devices/architecture/hidl-java/index.html
@@ -72,6 +72,8 @@ IFoo server = IFoo.getService(true /* retry */); // throws NoSuchElementExceptio
 IFoo anotherServer = IFoo.getService("second_impl", true /* retry */);
 server.doSomething(…);
 </pre>
+<p class=caution><strong>Warning</strong>: Java <code>getService</code> with no arguments will not
+wait for the service to start.</p>
 </li>
 </ol>
 
diff --git a/en/devices/architecture/vintf/objects.html b/en/devices/architecture/vintf/objects.html
index a5e34a2c..825b20d9 100644
--- a/en/devices/architecture/vintf/objects.html
+++ b/en/devices/architecture/vintf/objects.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
@@ -30,18 +31,54 @@ on the schema, see <a href="#manifest-file-schema">Manifest file schema</a>).
 
 <h2 id="device-manifest-file">Device manifest</h2>
 <p>The Device manifest (provided by the device) consists of the vendor manifest
-and the ODM manifest:</p>
+and the ODM manifest.</p>
 
 <ul>
 <li>The vendor manifest specifies HALs, VNDK versions, etc. common to an SoC. It
 is recommended to be placed in the Android source tree at
-<code>device/${VENDOR}/${DEVICE}/manifest.xml</code>, but multiple fragment
+<code>device/<var>VENDOR</var>/<var>DEVICE</var>/manifest.xml</code>, but multiple fragment
 files can be used. For details, see
 <a href="/devices/architecture/vintf/resources.html#manifest-fragments">Generate
 DM from fragments</a>.
 </li>
-<li>The ODM manifest overrides the vendor manifest and lists HALs specific to
-the product.</li>
+<li>The ODM manifest lists HALs specific to the product. VINTF Object loads the ODM manifest as
+  follows:
+  <ol>
+    <li>If <code><var>SKU</var></code> is defined (where <code><var>SKU</var></code> is the value of
+      the property <code>ro.boot.product.hardware.sku</code>),
+      <code>/odm/etc/vintf/manifest_<var>SKU</var>.xml</code>
+    </li>
+    <li><code>/odm/etc/vintf/manifest.xml</code></li>
+    <li>If <code><var>SKU</var></code> is defined,
+      <code>/odm/etc/manifest_<var>SKU</var>.xml</code></li>
+    <li><code>/odm/etc/manifest.xml</code></li>
+  </ol>
+</li>
+<li>VINTF Object loads the device manifest as follows:
+  <ol>
+    <li>If <code>/vendor/etc/vintf/manifest.xml</code> exists, combine the following:
+      <ol>
+        <li><code>/vendor/etc/vintf/manifest.xml</code></li>
+        <li>optional vendor manifest fragments</li>
+        <li>optional ODM manifest
+        <li>optional ODM manifest fragments</li>
+      </ol>
+    <li>If ODM manifest exists, combine ODM manifest with optional ODM manifest fragments.</li>
+    <li><code>/vendor/manfiest.xml</code> (legacy, no fragments)</li>
+  </ol>
+Note that:
+  <ul>
+    <li>On legacy devices, the legacy vendor manifest and ODM manifest are used. The
+      ODM manifest may completely override the legacy vendor manifest.</li>
+    <li>On devices launched with Android {{ androidPVersionNumber }}, the ODM manifest is combined
+      with vendor manifest.</li>
+    <li>When combining a list of manifests, manifests that appear later in the list may override
+      tags in manifests that appear earlier in the list, provided that the tags in the later
+      manifest has attribute <code>override="true"</code>. For example, ODM manifest may override
+      some <code>&lt;hal></code> tags from vendor manifest. See documentation for attribute
+      <code>override</code> below.</li>
+  </ul>
+</li>
 </ul>
 
 <p>This setup enables multiple products with the same board to share the same
@@ -120,6 +157,7 @@ specify product-specific HALs).</p>
 &lt;?xml version="1.0" encoding="UTF-8"?>
 &lt;!-- Comments, Legal notices, etc. here -->
 &lt;manifest version="1.0" type="device">
+    &lt;!-- camera 3.4 in vendor manifest is ignored -->
     &lt;hal override="true">
         &lt;name>android.hardware.camera&lt;/name>
         &lt;transport>hwbinder&lt;/transport>
@@ -129,6 +167,7 @@ specify product-specific HALs).</p>
             &lt;instance>legacy/0&lt;/instance>
         &lt;/interface>
     &lt;/hal>
+    &lt;!-- NFC is disabled -->
     &lt;hal override="true">
         &lt;name>android.hardware.nfc&lt;/name>
         &lt;transport>hwbinder&lt;/transport>