From 516c3cea504f1b0d4d8ab22b9f5045df97a172eb Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Wed, 16 Dec 2020 16:07:58 -0800
Subject: [PATCH] Immediately finish FingerprintEnroll when no
 FingerprintManager

Fixes: 161603652
Test: adb shell am start -a android.settings.FINGERPRINT_ENROLL
Change-Id: I52e2770a8870a1699dec5b20cb8c54db8991a14d
---
 .../fingerprint/FingerprintEnrollIntroduction.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index c2dc3ac2720..23a11339525 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -48,9 +48,14 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
+        if (mFingerprintManager == null) {
+            Log.e(TAG, "Null FingerprintManager");
+            finish();
+            return;
+        }
+
+        super.onCreate(savedInstanceState);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(