am d63408d9: am d7e4cd9b: am f7fc6429: Merge "Don\'t attempt to remove fp templates if none are enrolled" into mnc-dr-dev

* commit 'd63408d91576277acec9c2169e48eff839516470':
  Don't attempt to remove fp templates if none are enrolled
This commit is contained in:
Jim Miller
2015-08-25 23:33:55 +00:00
committed by Android Git Automerger

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();