diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-03-17 19:57:58 -0600 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2016-03-17 19:58:05 -0600 |
| commit | cf3f0a11a83e7a798e0586a78efdafc82a7f3d08 (patch) | |
| tree | 110042262b4bf24707d23caf82d4484acbed0146 /core/java/android/preference/PreferenceManager.java | |
| parent | 62b5ec7651ebda7a90682012e00307225201bbd9 (diff) | |
Update direct boot related documentation.
Also hide a few APIs as requested by council. Add a method to
easily determine if a given File would already be encrypted at rest
by the OS.
Bug: 27531029
Change-Id: Icad5f1cd56411ad3ac707db85fd7449acdcc4b94
Diffstat (limited to 'core/java/android/preference/PreferenceManager.java')
| -rw-r--r-- | core/java/android/preference/PreferenceManager.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java index c36680cdb210..47dc6c367ebc 100644 --- a/core/java/android/preference/PreferenceManager.java +++ b/core/java/android/preference/PreferenceManager.java @@ -362,8 +362,7 @@ public class PreferenceManager { * Explicitly set the storage location used internally by this class to be * device-protected storage. * <p> - * <p> - * When a device is encrypted, data stored in this location is encrypted + * On devices with direct boot, data stored in this location is encrypted * with a key tied to the physical device, and it can be accessed * immediately after the device has booted successfully, both * <em>before and after</em> the user has authenticated with their @@ -392,7 +391,7 @@ public class PreferenceManager { * credential-protected storage. This is the default storage area for apps * unless {@code forceDeviceProtectedStorage} was requested. * <p> - * When a device is encrypted, data stored in this location is encrypted + * On devices with direct boot, data stored in this location is encrypted * with a key tied to user credentials, which can be accessed * <em>only after</em> the user has entered their credentials (such as a * lock pattern or PIN). |