Don't attempt to remove fp templates if none are enrolled

The code was blindly calling fpm.remove(0) to remove all
fingerprint templates and then waiting for them to be removed.

Fixes bug 23183484

Change-Id: Ie510097d85bba32d965ba3c7f324f6c042e08300
This commit is contained in:
Jim Miller
2015-08-21 18:07:50 -07:00
parent 5d187aa43d
commit c2f6813a83

View File

@@ -505,7 +505,8 @@ public class ChooseLockGeneric extends SettingsActivity {
} }
private void removeAllFingerprintTemplatesAndFinish() { private void removeAllFingerprintTemplatesAndFinish() {
if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) { if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
&& mFingerprintManager.getEnrolledFingerprints().size() > 0) {
mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback); mFingerprintManager.remove(new Fingerprint(null, 0, 0, 0), mRemovalCallback);
} else { } else {
finish(); finish();