Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev (93071a4b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -142,8 +142,16 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
		@Override
		public void onResume() {
		super.onResume();
		refreshLockScreen();
		}

		protected void refreshLockScreen() {
		if (mAllowFpAuthentication) {
		mFingerprintHelper.startListening();
		} else {
		if (mFingerprintHelper.isListening()) {
		mFingerprintHelper.stopListening();
		}
		}
		if (isProfileChallenge()) {
		updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
		@@ -168,7 +176,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
		@Override
		public void onPause() {
		super.onPause();
		if (mAllowFpAuthentication) {
		if (mFingerprintHelper.isListening()) {
		mFingerprintHelper.stopListening();
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -498,6 +498,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
		checkForPendingIntent();
		} else {
		if (timeoutMs > 0) {
		refreshLockScreen();
		long deadline = mLockPatternUtils.setLockoutAttemptDeadline(
		effectiveUserId, timeoutMs);
		handleAttemptLockout(deadline);

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
		}
		}

		private boolean isListening() {
		public boolean isListening() {
		return mCancellationSignal != null && !mCancellationSignal.isCanceled();
		}