Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccbf30c1 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Quick unlock : Fix bug" into ics

parents ddedb890 ae8bfb06

policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java

+2 −12
Original line number Original line Diff line number Diff line
@@ -35,18 +35,15 @@ import android.text.InputType; 
import android.text.TextWatcher;

import android.text.TextWatcher;

import android.text.method.DigitsKeyListener;

import android.text.method.DigitsKeyListener;

import android.text.method.TextKeyListener;

import android.text.method.TextKeyListener;

import android.view.Gravity;

import android.view.KeyEvent;

import android.view.KeyEvent;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup.LayoutParams;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.EditorInfo;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodInfo;

import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodManager;

import android.view.inputmethod.InputMethodSubtype;

import android.view.inputmethod.InputMethodSubtype;

import android.widget.EditText;

import android.widget.EditText;

import android.widget.LinearLayout;

import android.widget.LinearLayout;

import android.widget.Space;

import android.widget.TextView;

import android.widget.TextView;

import android.widget.TextView.OnEditorActionListener;

import android.widget.TextView.OnEditorActionListener;
@@ -184,17 +181,10 @@ public class PasswordUnlockScreen extends LinearLayout implements KeyguardScreen 
                }

                }

                if (mQuickUnlock) {

                if (mQuickUnlock) {

                    String entry = mPasswordEntry.getText().toString();

                    String entry = mPasswordEntry.getText().toString();

                    if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT) {

                    if (entry.length() > MINIMUM_PASSWORD_LENGTH_BEFORE_REPORT &&

                        if (mLockPatternUtils.checkPassword(entry)) {

                            mLockPatternUtils.checkPassword(entry)) {

                            mCallback.keyguardDone(true);

                            mCallback.keyguardDone(true);

                            mCallback.reportSuccessfulUnlockAttempt();

                            mCallback.reportSuccessfulUnlockAttempt();

                        } else {

                            mCallback.reportFailedUnlockAttempt();

                            if (0 == (mUpdateMonitor.getFailedAttempts() % LockPatternUtils.FAILED_ATTEMPTS_BEFORE_TIMEOUT)) {

                                long deadline = mLockPatternUtils.setLockoutAttemptDeadline();

                                handleAttemptLockout(deadline);

                            }

                        }

                    }

                    }

                }

                }

            }

            }