Merge "Don't attempt to remove fp templates if none are enrolled" into mnc-dr-dev

2015-08-25 23:08:55 +00:00
parent 1a9626f056 c2f6813a83
commit f7fc642987
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -505,7 +505,8 @@ public class ChooseLockGeneric extends SettingsActivity {
        }

        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);
            } else {
                finish();