Merge "Update build numbers for LMY47E,M,Z and LYZ28E"
diff --git a/src/devices/tech/security/verifiedboot/verified-boot.jd b/src/devices/tech/security/verifiedboot/verified-boot.jd
index 1216fec..19a95a4 100644
--- a/src/devices/tech/security/verifiedboot/verified-boot.jd
+++ b/src/devices/tech/security/verifiedboot/verified-boot.jd
@@ -222,7 +222,7 @@
flashing lock</code></td>
<td>
<ul>
- <li>Wipe data after asking the user for confirmation
+ <li>Wipe data after asking the user for confirmation
<li>Clear a write-protected bit indicating the device is unlocked
</ul>
</td>
@@ -233,7 +233,7 @@
flashing unlock</code></td>
<td>
<ul>
- <li>Wipe data after asking the user for confirmation
+ <li>Wipe data after asking the user for confirmation
<li>Set a write-protected bit indicating the device is unlocked
</ul>
</td>
@@ -498,11 +498,11 @@
</td>
<td>
<img src="../images/boot_yellow1.png" alt="Yellow device state 1" id="figure4" />
-<p class="img-caption"><strong>Figure 4.</strong> Yellow state example 1 UI</p>
+<p class="img-caption"><strong>Figure 3.</strong> Yellow state example 1 UI</p>
</td>
<td>
<img src="../images/boot_yellow2.png" alt="Yellow device state 2" id="figure5" />
-<p class="img-caption"><strong>Figure 5.</strong> Yellow state example 2 UI</p>
+<p class="img-caption"><strong>Figure 4.</strong> Yellow state example 2 UI</p>
</td>
</tr>
@@ -512,7 +512,7 @@
</td>
<td>
<img src="../images/boot_orange.png" alt="Orange device state" id="figure6" />
-<p class="img-caption"><strong>Figure 6.</strong> Orange state example UI</p>
+<p class="img-caption"><strong>Figure 5.</strong> Orange state example UI</p>
</td>
</tr>
<tr>
@@ -521,7 +521,7 @@
</td>
<td>
<img src="../images/boot_red.png" alt="Red device state" id="figure7" />
-<p class="img-caption"><strong>Figure 7.</strong> Red state example UI</p>
+<p class="img-caption"><strong>Figure 6.</strong> Red state example UI</p>
</td>
</tr>
</table>
diff --git a/src/index.jd b/src/index.jd
index b36e632..8ec1004 100644
--- a/src/index.jd
+++ b/src/index.jd
@@ -42,6 +42,17 @@
<div class="landing-docs">
<div class="col-8">
<h3>What's New</h3>
+<a href="{@docRoot}devices/tech/security/verifiedboot/verified-boot.html">
+ <h4>Verified Boot Improvements</h4></a>
+ <p><strong><a
+ href="{@docRoot}devices/tech/security/verifiedboot/verified-boot.html#classes">Verifying
+ Boot</a></strong> has been rewritten to remove the VERIFIED state and Keystore
+ format and add details on implementation classes, communicating boot state, and
+ kernel command line parameters. And performance recommendations have been added
+ to <strong><a
+ href="{@docRoot}devices/tech/security/verifiedboot/dm-verity.html#optimize">Implementing
+ dm-verity</a></strong>.</p>
+
<a href="{@docRoot}source/building.html">
<h4>Increased Disk Space Requirements</h4></a>
<p>The amount of available disk space required to build Android has
@@ -80,14 +91,6 @@
href="{@docRoot}devices/audio/latency_measurements.html">round-trip audio latency
measurements</a></strong> for select Nexus devices to help partners compare their
own devices and reduce latency further.</p>
-
-<a href="{@docRoot}devices/tech/power/index.html">
- <h4>Power Profile Details</h4></a>
- <p><strong><a
- href="{@docRoot}devices/tech/power/index.html">Power</a></strong>
- information has been moved and expanded to include details on
- <code>cpu.awake</code> and <code>cpu.active</code>. The need to create a
- <code>power_profile.xml</code> file is also emphasized throughout.</p>
</div>
<div class="col-8">
diff --git a/src/source/building-devices.jd b/src/source/building-devices.jd
index fee5254..f0d978e 100644
--- a/src/source/building-devices.jd
+++ b/src/source/building-devices.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2013 The Android Open Source Project
+ Copyright 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -28,31 +28,24 @@
<a href="building-running.html">Building and Running</a> with
information that is specific to individual devices.</p>
-<p>With the current release, it is possible to build for
-Nexus 4, Nexus 7, and for some variants of Galaxy Nexus.
-The exact level of functionality for each device depends on the availability
-of the relevant proprietary hardware-specific binaries.</p>
-<p>For Nexus 4 and Nexus 7, all configurations can be used,
-and all the hardware is functional.
-Due to hardware differences, do not use 4.1.1 on a Nexus 7 that
+<h2 class="nexus-devices">Nexus devices</h2>
+<p>
+It is possible to build for Nexus devices using the AOSP
+builds and the relevant hardware-specific binaries.
+For a list of available Android builds and the Nexus devices
+they can be installed on, see <a
+href="build-numbers.html#source-code-tags-and-builds">Source
+Code, Tags, and Builds</a>.
+</p>
+
+<p class="note">
+<b>Note:</b> Due to hardware differences, do not use 4.1.1 on a Nexus 7 that
was originally sold with 4.1.2 or newer.</p>
-<p>All configurations of Nexus 10 "manta" can be used with 4.2.2.
-On those devices, graphics, audio,
-Wi-Fi, Bluetooth, camera, NFC, GPS and orientation sensors are functional.</p>
-<p>The variants of Galaxy Nexus that can be used are the GSM/HSPA+ configuration
-"maguro" (only if it was originally sold with a "yakju" or "takju" operating
-system) and the VZW CDMA/LTE configuration "toro". On those devices, graphics
-and audio are functional, as well as Wi-Fi, Bluetooth, and access to the
-respective cellular networks. NFC and the orientation sensors are functional.</p>
-<p>The Sprint CDMA/LTE configuration "toroplus" of Galaxy Nexus is supported
-experimentally, in the jb-mr1-dev-plus-aosp branch. On that configuration,
-the cellular network is not functional,
-and the other peripherals work like they do on "toro".</p>
+
+<h2 class="other-devices">Other devices</h2>
<p>The Motorola Xoom can be used in the Wi-Fi configuration "wingray"
sold in the USA, with Android 4.1.2. Graphics and audio are functional
as well as Wi-Fi and Bluetooth and the orientation sensors.</p>
-<p>All configurations of Nexus S and Nexus S 4G can be used with Android 4.1.2.
-On those devices all the hardware is functional.</p>
<p>In addition, <a href="http://pandaboard.org">PandaBoard</a> a.k.a. "panda" can be used
in the jb-mr1-dev-plus-aosp branch, but is considered experimental.
The specific details to use a PandaBoard with the Android Open-Source Project
@@ -64,6 +57,7 @@
<a href="building-running.html">Building and Running</a>, and replace the main <code>make</code> command with</p>
<pre><code>$ make fastboot adb
</code></pre>
+
<h2 id="booting-into-fastboot-mode">Booting into fastboot mode</h2>
<p>During a cold boot, the following key combinations can be used to boot into fastboot mode,
which is a mode in the bootloader that can be used to flash the devices:</p>