Merge "Don't reset fingerprint storage on devices without fingerprint hw."

This commit is contained in:
Jim Miller
2015-03-12 17:57:50 +00:00
committed by Android (Google) Code Review

View File

@@ -414,8 +414,8 @@ public class ChooseLockGeneric extends SettingsActivity {
}; };
private void removeAllFingerprintTemplates() { private void removeAllFingerprintTemplates() {
mFingerprintManager.startListening(mReceiver); if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
if (mFingerprintManager != null) { mFingerprintManager.startListening(mReceiver);
mFingerprintManager.remove(0 /* all fingerprint templates */); mFingerprintManager.remove(0 /* all fingerprint templates */);
} }
} }