From 7656830457f42e2f810fcb3eced3c820025c2456 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 8 Feb 2016 12:29:25 -0800
Subject: [PATCH] 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 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index cf37050e219..df09c49ba54 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -49,7 +49,8 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
     }
 
     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(
-- 
GitLab