summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2015-06-16 13:22:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-16 13:22:22 +0000
commitdbc86ad170e2c288f0154a264d12bd6dadf78c45 (patch)
tree20ffd1584f9ff70dbb929c72777ee2a48d8bfd09
parentec01f3d276e2e06647f5a71e45b06e7cf964cc19 (diff)
parentc6a9653e0a4a8923116a01a5d690f5369ab63e43 (diff)
downloadframeworks_base-dbc86ad170e2c288f0154a264d12bd6dadf78c45.zip
frameworks_base-dbc86ad170e2c288f0154a264d12bd6dadf78c45.tar.gz
frameworks_base-dbc86ad170e2c288f0154a264d12bd6dadf78c45.tar.bz2
Merge "Update documentation for PASSWORD_QUALITY_SOMETHING" into mnc-dev
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9f49154..634f116 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -924,7 +924,7 @@ public class DevicePolicyManager {
/**
* Constant for {@link #setPasswordQuality}: the policy requires some kind
- * of password, but doesn't care what it is. Note that quality constants
+ * of password or pattern, but doesn't care what it is. Note that quality constants
* are ordered so that higher values are more restrictive.
*/
public static final int PASSWORD_QUALITY_SOMETHING = 0x10000;