diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-02 19:03:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-02 19:03:25 +0000 |
| commit | 7bbedee7a4bf763c2158cf1af44ef6d5311bd5ef (patch) | |
| tree | c8d5cc1651b3c61c54f0717f590ece0f7757d864 /core/java | |
| parent | 046642fe765a9ca2d6acdd54e8b2b24111ac8be8 (diff) | |
| parent | 4b2f7aacd1cc03805169b71934cd0afb0f676950 (diff) | |
Merge "Clarify javadoc for DevicePolicyManager.KEYGUARD_DISABLE_WIDGETS_ALL"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 2c4bf8260fe6..ee5ea806da34 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3712,7 +3712,9 @@ public class DevicePolicyManager { public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; /** - * Disable all keyguard widgets. Has no effect. + * Disable all keyguard widgets. Has no effect starting from + * {@link android.os.Build.VERSION_CODES#LOLLIPOP} since keyguard widget is only supported + * on Android versions lower than 5.0. */ public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1 << 0; |