5 files changed, 43 insertions, 7 deletions
diff --git a/en/devices/bootloader/flashing-updating.html b/en/devices/bootloader/flashing-updating.html
index 5fdc5aa9..9c05593c 100644
--- a/en/devices/bootloader/flashing-updating.html
+++ b/en/devices/bootloader/flashing-updating.html
@@ -64,6 +64,18 @@ messaging, to land as:
 <code>androidboot.bootreason=&lt;reason&gt;</code></li>
 
 </ul>
+<h2 id="booting-device-tree">Booting: device tree/device tree overlays</h2>
+<p>
+To support various configurations, the bootloader can identify the hardware/product revision
+it is running on and load the correct set of device tree overlays.
+</p>
+<h3 id="kaslr-seed-from-bootloader">Supporting Kernel Address Space Layout Randomization</h3>
+<p>
+In order to support randomizing the virtual address at which the kernel image is loaded
+(enabled by kernel config RANDOMIZE_BASE), the bootloader needs to provide entropy
+by passing a random u64 value in the DT node /chosen/kaslr-seed.
+</p>
+
 <h2 id="implementing-verified-boot">Implementing verified boot</h2>
 <p>
 Refer to <a
diff --git a/en/devices/camera/versioning.html b/en/devices/camera/versioning.html
index 03247001..b6e3404f 100644
--- a/en/devices/camera/versioning.html
+++ b/en/devices/camera/versioning.html
@@ -338,7 +338,7 @@ The method name is <code><a
     href="https://developer.android.com/reference/android/hardware/camera2/CameraCaptureSession.StateCallback.html#onCaptureQueueEmpty(android.hardware.camera2.CameraCaptureSession)">android.hardware.camera2.CameraDevice#createCustomCaptureSession</a></code>.
 See:
 <a href="https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/hardware/camera2/CameraDevice.java#805">
-  <code>frameworks/base/core/java/android/hardware/camera2/CameraDevice.java#797</code></a></p>
+  <code>frameworks/base/core/java/android/hardware/camera2/CameraDevice.java#805</code></a></p>
 
 <aside class="note"><strong>Note:</strong> In the Android 8.1 release,
   applications must be preinstalled on the system image to access this API.
diff --git a/en/devices/input/input-device-configuration-files.html b/en/devices/input/input-device-configuration-files.html
index 20402dac..97234ab0 100644
--- a/en/devices/input/input-device-configuration-files.html
+++ b/en/devices/input/input-device-configuration-files.html
@@ -53,11 +53,17 @@ especially built-in touch screens, usually need IDC files.</p>
 optionally version) id or by input device name.</p>
 <p>The following paths are consulted in order.</p>
 <ul>
+<li><code>/odm/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
+<li><code>/vendor/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
 <li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
-<li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
-<li><code>/system/usr/idc/DEVICE_NAME.idc</code></li>
 <li><code>/data/system/devices/idc/Vendor_XXXX_Product_XXXX_Version_XXXX.idc</code></li>
+<li><code>/odm/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/vendor/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/system/usr/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
 <li><code>/data/system/devices/idc/Vendor_XXXX_Product_XXXX.idc</code></li>
+<li><code>/odm/usr/idc/DEVICE_NAME.idc</code></li>
+<li><code>/vendor/usr/idc/DEVICE_NAME.idc</code></li>
+<li><code>/system/usr/idc/DEVICE_NAME.idc</code></li>
 <li><code>/data/system/devices/idc/DEVICE_NAME.idc</code></li>
 </ul>
 <p>When constructing a file path that contains the device name, all characters
diff --git a/en/devices/input/key-character-map-files.html b/en/devices/input/key-character-map-files.html
index 803610e3..618f0014 100644
--- a/en/devices/input/key-character-map-files.html
+++ b/en/devices/input/key-character-map-files.html
@@ -38,14 +38,24 @@ choose a default instead.</p>
 id or by input device name.</p>
 <p>The following paths are consulted in order.</p>
 <ul>
+<li><code>/odm/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
+<li><code>/vendor/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
 <li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
-<li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
-<li><code>/system/usr/keychars/DEVICE_NAME.kcm</code></li>
 <li><code>/data/system/devices/keychars/Vendor_XXXX_Product_XXXX_Version_XXXX.kcm</code></li>
+<li><code>/odm/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/vendor/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/system/usr/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
 <li><code>/data/system/devices/keychars/Vendor_XXXX_Product_XXXX.kcm</code></li>
+<li><code>/odm/usr/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/vendor/usr/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/system/usr/keychars/DEVICE_NAME.kcm</code></li>
 <li><code>/data/system/devices/keychars/DEVICE_NAME.kcm</code></li>
+<li><code>/odm/usr/keychars/Generic.kcm</code></li>
+<li><code>/vendor/usr/keychars/Generic.kcm</code></li>
 <li><code>/system/usr/keychars/Generic.kcm</code></li>
 <li><code>/data/system/devices/keychars/Generic.kcm</code></li>
+<li><code>/odm/usr/keychars/Virtual.kcm</code></li>
+<li><code>/vendor/usr/keychars/Virtual.kcm</code></li>
 <li><code>/system/usr/keychars/Virtual.kcm</code></li>
 <li><code>/data/system/devices/keychars/Virtual.kcm</code></li>
 </ul>
diff --git a/en/devices/input/key-layout-files.html b/en/devices/input/key-layout-files.html
index 486b4fcb..ed8aa6cd 100644
--- a/en/devices/input/key-layout-files.html
+++ b/en/devices/input/key-layout-files.html
@@ -39,12 +39,20 @@ default instead.</p>
 <p>Key layout files are located by USB vendor, product (and optionally version)
 id or by input device name. The following paths are consulted in order:</p>
 <ul>
+<li><code>/odm/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
+<li><code>/vendor/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
 <li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
-<li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
-<li><code>/system/usr/keylayout/DEVICE_NAME.kl</code></li>
 <li><code>/data/system/devices/keylayout/Vendor_XXXX_Product_XXXX_Version_XXXX.kl</code></li>
+<li><code>/odm/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/vendor/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/system/usr/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
 <li><code>/data/system/devices/keylayout/Vendor_XXXX_Product_XXXX.kl</code></li>
+<li><code>/odm/usr/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/vendor/usr/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/system/usr/keylayout/DEVICE_NAME.kl</code></li>
 <li><code>/data/system/devices/keylayout/DEVICE_NAME.kl</code></li>
+<li><code>/odm/usr/keylayout/Generic.kl</code></li>
+<li><code>/vendor/usr/keylayout/Generic.kl</code></li>
 <li><code>/system/usr/keylayout/Generic.kl</code></li>
 <li><code>/data/system/devices/keylayout/Generic.kl</code></li>
 </ul>