summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Yu <dsyu@google.com> 2016-07-15 20:09:34 +0000
committer android-build-merger <android-build-merger@google.com> 2016-07-15 20:09:34 +0000
commit7b10126ed6ee9f21a0b47990defb73301e1808fe (patch)
treec4eee9669ed4881f211fc0c3dd82c66bbfaceca7
parent6198b6cdfbe306fb6426a85c5973d2f4d018d076 (diff)
parent344a7375d7a8a63edf2fd91b4578f25b45cd06b6 (diff)
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am: 344a7375d7 Change-Id: I9f05ab3452788942b6fc3e0d45ed92e0e5401ea6
-rw-r--r--docs/html/preview/features/direct-boot.jd32
1 files changed, 32 insertions, 0 deletions
diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
index 8351f4b4b10f..60f6141856e1 100644
--- a/docs/html/preview/features/direct-boot.jd
+++ b/docs/html/preview/features/direct-boot.jd
@@ -14,6 +14,7 @@ page.image=images/cards/card-nyc_2x.jpg
<li><a href="#notification">Getting Notified of User Unlock</a></li>
<li><a href="#migrating">Migrating Existing Data</a></li>
<li><a href="#testing">Testing Your Encryption Aware App</a></li>
+ <li><a href="#dpm">Checking Device Policy Encryption Status</a></li>
</ol>
</div>
</div>
@@ -186,3 +187,34 @@ $ adb shell sm set-emulate-fbe false
</pre>
<p>Using these commands causes the device to reboot.</p>
+
+<h2 id="dpm">Checking Device Policy Encryption Status</h2>
+
+<p>Device administration apps can use
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+DevicePolicyManager.getStorageEncryptionStatus()} to check the current
+encryption status of the device. If your app is targeting an API level
+lower than Android N,
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+getStorageEncryptionStatus()} will return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} if the device is either using full-disk encryption,
+or file-based encryption with Direct Boot. In both of these cases, data is
+always stored encrypted at rest. If your app is targeting an API level of
+Android N or higher,
+{@link android.app.admin.DevicePolicyManager#getStorageEncryptionStatus
+getStorageEncryptionStatus()} will return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} if the device is using full-disk encryption. It will
+return
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER
+ENCRYPTION_STATUS_ACTIVE_PER_USER} if the device is using file-based encryption
+with Direct Boot.</p>
+
+<p>If you build a device administration app
+that targets Android N, make sure to check for both
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE
+ENCRYPTION_STATUS_ACTIVE} and
+{@link android.app.admin.DevicePolicyManager#ENCRYPTION_STATUS_ACTIVE_PER_USER
+ENCRYPTION_STATUS_ACTIVE_PER_USER} to determine if the device is
+encrypted.</p>