commit cc7a4f3cac6dfa0bd25dc961242a5250a698edb7
author Jim Miller <jaggies@google.com> Thu Mar 12 17:57:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 12 17:57:51 2015 +0000
tree cad5da5fb2238d93473e98ae3240a8d3d9fdaf5d
parent 39d1d67085c21b8d92ad991ad6522be9c7d92896
parent d52b577d490bfd87c8ffe2e519ad2e1f51104d87

Merge "Don't reset fingerprint storage on devices without fingerprint hw."

src/com/android/settings/ChooseLockGeneric.java

diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java
index 216b1ca..331fbae 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -414,8 +414,8 @@
         };
 
         private void removeAllFingerprintTemplates() {
-            mFingerprintManager.startListening(mReceiver);
-            if (mFingerprintManager != null) {
+            if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()) {
+                mFingerprintManager.startListening(mReceiver);
                 mFingerprintManager.remove(0 /* all fingerprint templates */);
             }
         }