diff options
| author | Andy Stadler <stadler@google.com> | 2011-03-07 19:13:42 -0800 |
|---|---|---|
| committer | Andy Stadler <stadler@google.com> | 2011-03-07 19:13:42 -0800 |
| commit | 50c294f21b3348010c3f91c5a998d54e1e45d2e4 (patch) | |
| tree | b7e69fa6744fda122ab667dbb9745f3f4741a06e /core/java/android/app | |
| parent | ff23352ea70339c4230d628ab294fbf52159da06 (diff) | |
| download | frameworks_base-50c294f21b3348010c3f91c5a998d54e1e45d2e4.zip frameworks_base-50c294f21b3348010c3f91c5a998d54e1e45d2e4.tar.gz frameworks_base-50c294f21b3348010c3f91c5a998d54e1e45d2e4.tar.bz2 | |
Clarify rules about encryption of emulated storage.
Bug: 3351426
Change-Id: I3a8fcd369862f3eab1781699108e29fe7ab474a0
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 440cb54..efe2633 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1150,8 +1150,12 @@ public class DevicePolicyManager { * fail (most commonly returning {@link #ENCRYPTION_STATUS_ACTIVE}). * * <p>This policy controls encryption of the secure (application data) storage area. Data - * written to other areas (e.g. the directory returned by - * {@link android.os.Environment#getExternalStorageDirectory()} may or may not be encrypted. + * written to other storage areas may or may not be encrypted, and this policy does not require + * or control the encryption of any other storage areas. + * There is one exception: If {@link android.os.Environment#isExternalStorageEmulated()} is + * {@code true}, then the directory returned by + * {@link android.os.Environment#getExternalStorageDirectory()} must be written to disk + * within the encrypted storage area. * * <p>Important Note: On some devices, it is possible to encrypt storage without requiring * the user to create a device PIN or Password. In this case, the storage is encrypted, but |