resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev

Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0

diff --cc core/java/android/app/admin/DevicePolicyManager.java
Simple merge

diff --cc core/java/android/app/admin/IDevicePolicyManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/LockSettingsService.java
Simple merge

diff --cc services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 92aa1b9,aaa7cd9..fbb865b
--- 1/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
--- 2/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@@ -3740,12 -3667,10 +3729,14 @@@ public class DevicePolicyManagerServic
  
      private boolean isActivePasswordSufficientForUserLocked(
              DevicePolicyData policy, int userHandle, boolean parent) {
 -        if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent)
 -                || policy.mActivePasswordLength < getPasswordMinimumLength(
+         enforceUserUnlocked(userHandle, parent);
+ 
 +        final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);
 +        if (policy.mActivePasswordQuality < requiredPasswordQuality) {
 +            return false;
 +        }
 +        if (requiredPasswordQuality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC
 +                && policy.mActivePasswordLength < getPasswordMinimumLength(
                          null, userHandle, parent)) {
              return false;
          }