Merge "FingerprintSettings should handle FINGERPRINT_ERROR_LOCKOUT_PERMANENT" into oc-dr1-dev

am: b4bbc52e27

Change-Id: I7d9ba9fb5b1bd75a3565963bc13b82606761970b
This commit is contained in:
Kevin Chyn
2017-06-20 23:38:12 +00:00
committed by android-build-merger

View File

@@ -261,14 +261,18 @@ public class FingerprintSettings extends SubSettings {
mHandler.postDelayed(mFingerprintLockoutReset, mHandler.postDelayed(mFingerprintLockoutReset,
LOCKOUT_DURATION); LOCKOUT_DURATION);
} }
// Fall through to show message break;
default: case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT:
mInFingerprintLockout = true;
break;
}
if (mInFingerprintLockout) {
// Activity can be null on a screen rotation. // Activity can be null on a screen rotation.
final Activity activity = getActivity(); final Activity activity = getActivity();
if (activity != null) { if (activity != null) {
Toast.makeText(activity, msg , Toast.LENGTH_SHORT); Toast.makeText(activity, msg , Toast.LENGTH_SHORT).show();
} }
break;
} }
retryFingerprint(); // start again retryFingerprint(); // start again
} }