commit c2f6813a836014a5b38bcfaa24fe9e91671f4646
author Jim Miller <jaggies@google.com> Fri Aug 21 18:07:50 2015 -0700
committer Jim Miller <jaggies@google.com> Fri Aug 21 18:07:50 2015 -0700
tree 5fa9993b9750f111896d4f7a7ea2d234c2dde4b9
parent 5d187aa43d262582241cd3a7097fc2fda0c875e6

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

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