diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-03 05:03:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-03 05:03:22 +0000 |
| commit | 548107d94f075a47e9de6df340f2ad7cb054a0a9 (patch) | |
| tree | 18defa9bbc3cd0e76d913bc58c06a0a1f1c70b39 /core/java/android | |
| parent | c7d89b4bc26cf80fd77130159346c6cd321448ee (diff) | |
| parent | a60c07ac5807a944120fb0f2eac44ecdfc52bd79 (diff) | |
Merge "Add reminder comment for updating CTS test"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 92daf08dc59b..f129a717f2cd 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3845,6 +3845,11 @@ public class DevicePolicyManager { public static final int KEYGUARD_DISABLE_IRIS = 1 << 8; /** + * NOTE: Please remember to update the DevicePolicyManagerTest's testKeyguardDisabledFeatures + * CTS test when adding to the list above. + */ + + /** * Disable all biometric authentication on keyguard secure screens (e.g. PIN/Pattern/Password). */ public static final int KEYGUARD_DISABLE_BIOMETRICS = |