Merge "Docs: Correct small typo in FBE docs"
diff --git a/src/security/encryption/file-based.jd b/src/security/encryption/file-based.jd
index e21a8e4..f27859b 100644
--- a/src/security/encryption/file-based.jd
+++ b/src/security/encryption/file-based.jd
@@ -38,7 +38,7 @@
<h2 id="direct-boot">Direct Boot</h2>
<p>
File-based encryption enables a new feature introduced in Android 7.0 called <a
-href="https://developer.android.com/preview/features/direct-boot.html">Direct
+href="https://developer.android.com/training/articles/direct-boot.html">Direct
Boot</a>. Direct Boot allows encrypted devices to boot straight to the lock
screen. Previously, on encrypted devices using <a href="full-disk.html">full disk
encryption</a> (FDE), users needed to provided credentials before any data could
@@ -56,11 +56,13 @@
<p>
On an FBE-enabled device, each user of the device has two storage locations
available to applications:
-</p><ul>
-<li>Credential Encrypted (CE) storage, which is the default storage location and
-only available after the user has unlocked the device.
-<li>Device Encrypted (DE) storage, which is a storage location available both
-during Direct Boot mode and after the user has unlocked the device.</li></ul>
+</p>
+<ul>
+ <li>Credential Encrypted (CE) storage, which is the default storage location
+ and only available after the user has unlocked the device.</li>
+ <li>Device Encrypted (DE) storage, which is a storage location available both
+ during Direct Boot mode and after the user has unlocked the device.</li>
+</ul>
<p>
This separation makes work profiles more secure because it allows more than one
user to be protected at a time as the encryption is no longer based solely on a
@@ -71,8 +73,8 @@
areas. There are changes to the application lifecycle to accommodate the need to
notify applications when a user’s CE storage is <em>unlocked</em> in response to
first entering credentials at the lock screen, or in the case of work profile
-providing a <a
-href="https://developer.android.com/preview/api-overview.html#android_for_work">work
+providing a
+<a href="https://developer.android.com/about/versions/nougat/android-7.0.html#android_for_work">work
challenge</a>. Devices running Android 7.0 must support these new APIs and
lifecycles regardless of whether or not they implement FBE. Although, without
FBE, DE and CE storage will always be in the unlocked state.
@@ -165,9 +167,9 @@
<h2 id="implementation">Implementation</h2>
<p>
-First and foremost, apps such as alarm clocks, phone, accessibility features
+First and foremost, apps such as alarm clocks, phone, accessibility features
should be made android:directBootAware according to <a
-href="https://developer.android.com/preview/features/direct-boot.html">Direct
+href="https://developer.android.com/training/articles/direct-boot.html">Direct
Boot</a> developer documentation.
</p>
<h3 id="kernel-support">Kernel Support</h3>
@@ -209,8 +211,7 @@
<td>Nexus 6P (angler)
</td>
<td><strong>kernel/msm</strong> android-msm-angler-3.10-n-preview-2 (<a
-href="https://android.googlesource.com/kernel/msm/+/android-msm-angler-3.10-n-preview-2">git</a>
- )
+href="https://android.googlesource.com/kernel/msm/+/android-msm-angler-3.10-n-preview-2">git</a>)
</td>
</tr>
</table>
@@ -282,7 +283,7 @@
<p class="note">
<strong>Note</strong>: All encryption is based on AES-256 in
XTS mode. Due to the way XTS is defined, it needs two 256-bit keys; so in
-effect, both CE and DE keys are 512-bit keys.i
+effect, both CE and DE keys are 512-bit keys.
</p>
</li>
</ul>
