diff options
author | Unsuk Jung <unsuk@google.com> | 2015-06-06 00:06:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-06 00:06:43 +0000 |
commit | b4ac67bdcdc7d2c9146cc1f4fcc3c371141fbea1 (patch) | |
tree | c6f97f4bfa5e85c8fe4826a08103133bd6eb8e42 | |
parent | 497234c301eaf9481e72c9f409dcd62d2651c923 (diff) | |
parent | 34485ab57c1129317ad23c651085b5c64925aa5b (diff) | |
download | source.android.com-b4ac67bdcdc7d2c9146cc1f4fcc3c371141fbea1.tar.gz |
am 34485ab5: am 45a3c4c6: Merge "Clarify req. for full range of Device Admin Policies and FDE" into lmp-mr1-dev
* commit '34485ab57c1129317ad23c651085b5c64925aa5b':
Clarify req. for full range of Device Admin Policies and FDE
-rw-r--r-- | src/compatibility/5.1/android-5.1-cdd.html | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/compatibility/5.1/android-5.1-cdd.html b/src/compatibility/5.1/android-5.1-cdd.html index d6239c30..3b4529d8 100644 --- a/src/compatibility/5.1/android-5.1-cdd.html +++ b/src/compatibility/5.1/android-5.1-cdd.html @@ -1462,10 +1462,14 @@ all glyphs in the currency symbols block of Unicode 7.0.</p> <p>Android includes features that allow security-aware applications to perform device administration functions at the system level, such as enforcing password policies or performing remote wipe, through the Android Device Administration -API [<a href="http://developer.android.com/guide/topics/admin/device-admin.html">Resources, 39</a>]. Device implementations MUST provide an implementation of the -DevicePolicyManager class [<a href="http://developer.android.com/reference/android/app/admin/DevicePolicyManager.html">Resources, 40</a>]. Device implementations that include support for lock screen MUST support the -full range of device administration policies defined in the Android SDK -documentation [<a href="http://developer.android.com/guide/topics/admin/device-admin.html">Resources, 39</a>] and report the platform feature android.software.device_admin.</p> +API [<a href="http://developer.android.com/guide/topics/admin/device-admin.html">Resources, 39</a>]. +Device implementations MUST provide an implementation of the DevicePolicyManager class +[<a href="http://developer.android.com/reference/android/app/admin/DevicePolicyManager.html">Resources, 40</a>]. +Device implementations that include support for PIN (numeric) or PASSWORD +(alphanumeric) based lock screens MUST support the full range of device +administration policies defined in the Android SDK documentation +[<a href="http://developer.android.com/guide/topics/admin/device-admin.html">Resources, 39</a>] +and report the platform feature android.software.device_admin.</p> <p>Device implementations MAY have a preinstalled application performing device administration functions but this application MUST NOT be set out-of-the box as @@ -4178,8 +4182,9 @@ MUST ask for the user's consent before enabling that mechanism.</p> </div> -<p>If the device implementation has a lock screen, the device MUST support -full-disk encryption of the application private data, (/data partition) as well +<p>If the device implementation supports a lock screen with PIN (numeric) or +PASSWORD (alphanumeric), the device MUST support full-disk encryption of the +application private data (/data partition), as well as the SD card partition if it is a permanent, non-removable part of the device [<a href="http://source.android.com/devices/tech/security/encryption/index.html">Resources, 107</a>]. For devices supporting full-disk encryption, the full-disk encryption SHOULD be enabled all the time after the user has completed the out-of-box experience. |