Merge \\"Should not report unsuccessful attempt if pattern size < minimal size\\" into nyc-mr1-dev am: 9d83a9fbbb

am: 3a681a32a8

Change-Id: Id95c0d1ea210bf153ec26a83fc6789296f0070df

src/com/android/settings/ConfirmLockPattern.java

@@ -461,7 +461,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
             private void startCheckPattern(final List<LockPatternView.Cell> pattern,
                     final Intent intent) {
                 if (pattern.size() < LockPatternUtils.MIN_PATTERN_REGISTER_FAIL) {
-                    mCredentialCheckResultTracker.setResult(false, intent, 0, mEffectiveUserId);
+                    // Pattern size is less than the minimum, do not count it as an fail attempt.
+                    onPatternChecked(false, intent, 0, mEffectiveUserId, false /* newResult */);
                     return;
                 }