Merge "Fix crash in settings when no fingerprint is available"

2015-04-14 18:15:35 +00:00
parent 347c13bcb8 3b62e84289
commit aa2a53b3b7
1 changed files with 4 additions and 2 deletions
--- a/src/com/android/settings/FingerprintUiHelper.java
+++ b/src/com/android/settings/FingerprintUiHelper.java
@@ -56,8 +56,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
    }

    public void stopListening() {
-        mCancellationSignal.cancel();
-        mCancellationSignal = null;
+        if (mCancellationSignal != null) {
+            mCancellationSignal.cancel();
+            mCancellationSignal = null;
+        }
    }

    private void setFingerprintIconVisibility(boolean visible) {