summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Sandness <sandness@google.com> 2018-01-12 14:21:41 +0000
committer Eric Sandness <sandness@google.com> 2018-01-19 09:27:42 +0000
commit17accc16ee6c6c06050f0147b9af948ae7b011aa (patch)
treefdf089c24cfc2f3430f7a32abecbfaae4ab9cfe9
parentde5db0fb066287350ac6eab1738fb2113209cd67 (diff)
Javadoc For DA Deprecation
Highlight policies which are deprecated for use by device admins. See Android documentation for more details about device admin deprecation. Change-Id: I9e47a7499e8218985905d2a50ba83f72cc0911f9 Fixes: 63907325 Test: Documentation only change
-rw-r--r--core/java/android/app/admin/DeviceAdminInfo.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java
index 1de1d2fbb822..ed2aaf915ef2 100644
--- a/core/java/android/app/admin/DeviceAdminInfo.java
+++ b/core/java/android/app/admin/DeviceAdminInfo.java
@@ -75,6 +75,10 @@ public final class DeviceAdminInfo implements Parcelable {
*
* <p>To control this policy, the device admin must have a "limit-password"
* tag in the "uses-policies" section of its meta-data.
+ *
+ * <p>This policy is deprecated for use by a device admin. In future releases, it will
+ * only be possible for a device owner or profile owner to enforce constraints on user
+ * passwords.
*/
public static final int USES_POLICY_LIMIT_PASSWORD = 0;
@@ -136,6 +140,9 @@ public final class DeviceAdminInfo implements Parcelable {
*
* <p>To control this policy, the device admin must have an "expire-password"
* tag in the "uses-policies" section of its meta-data.
+ *
+ * <p>This policy is deprecated for use by a device admin. In future releases, it will
+ * only be possible for a device owner or profile owner to enforce password expiry.
*/
public static final int USES_POLICY_EXPIRE_PASSWORD = 6;
@@ -152,6 +159,9 @@ public final class DeviceAdminInfo implements Parcelable {
*
* <p>To control this policy, the device admin must have a "disable-camera"
* tag in the "uses-policies" section of its meta-data.
+ *
+ * <p>This policy is deprecated for use by a device admin. In future releases, it will
+ * only be possible for a device owner or profile owner to disable use of the camera.
*/
public static final int USES_POLICY_DISABLE_CAMERA = 8;
@@ -160,6 +170,10 @@ public final class DeviceAdminInfo implements Parcelable {
*
* <p>To control this policy, the device admin must have a "disable-keyguard-features"
* tag in the "uses-policies" section of its meta-data.
+ *
+ * <p>This policy is deprecated for use by a device admin. In future releases, it will
+ * only be possible for a device owner or profile owner to disable use of keyguard
+ * features.
*/
public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9;