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

This commit is contained in:
TreeHugger Robot
2017-06-20 23:36:25 +00:00
committed by Android (Google) Code Review

View File

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