commit 5947d3517d1cd841ddeb6f756e1953fc8679c9cc
author Jim Miller <jaggies@google.com> Mon Feb 08 12:29:25 2016 -0800
committer Jim Miller <jaggies@google.com> Mon Feb 08 20:31:49 2016 +0000
tree a638e91af3cda0c9141a258abdf4b50676a28b1d
parent 0f6b093db74fc4b1b914b1d7b301f9e841184ffe

Fix crash in ConfirmCredentials due to missing fp service.

Fixes bug 27060816

Change-Id: I25fa1ffc65247360f58473f5bc1745abbabb1e33
(cherry picked from commit 0918e5d650119aed5221b8ed3ac378f273216b45)

src/com/android/settings/fingerprint/FingerprintUiHelper.java

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index cf37050..df09c49 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -49,7 +49,8 @@
     }
 
     public void startListening() {
-        if (mFingerprintManager.getEnrolledFingerprints(mUserId).size() > 0) {
+        if (mFingerprintManager != null
+                && mFingerprintManager.getEnrolledFingerprints(mUserId).size() > 0) {
             mCancellationSignal = new CancellationSignal();
             mFingerprintManager.setActiveUser(mUserId);
             mFingerprintManager.authenticate(