commit f7fc6429874fd02bc3670bce98b2158d2a78aecd
author Jim Miller <jaggies@google.com> Tue Aug 25 23:08:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 25 23:08:55 2015 +0000
tree 656f7242ef2d4692ef38446b76c808875f1bdf60
parent 1a9626f056d253aa25fca561010624c463bbf9a9
parent c2f6813a836014a5b38bcfaa24fe9e91671f4646

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

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 167a381..94a9de5 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -505,7 +505,8 @@
         }
 
         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();