Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2931d8ac: Merge "DO NOT MERGE - Cherry picking from master to MR1" into ics-mr1

Browse Source 
* commit '2931d8ace9118bafe08090cd41e235048b6c2eb2':
  DO NOT MERGE - Cherry picking from master to MR1
This commit is contained in:
Danielle Millett
2012-01-12 07:31:36 -08:00
committed by Android Git Automerger
parent 79b499005f 2931d8ace9
commit d712248e4e
2 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/java/com/android/server/DevicePolicyManagerService.java
View File

@@ -831,6 +831,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
static void validateQualityConstant(int quality) {
switch (quality) {
case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED:
case DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK:
case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: