From c2f6813a836014a5b38bcfaa24fe9e91671f4646 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Fri, 21 Aug 2015 18:07:50 -0700
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 167a381b277..94a9de5f082 100644
--- 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();