From 59f3c0978ba247e6062b4b221b449e0ef5728451 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 21 Oct 2022 13:11:17 +0000
Subject: [PATCH] Fix possible NPE in FingerprintManager.

There's an unsafe use of a @Nullable reference in FingerprintManager.
Add null check.

Bug: 254465749
Test: Manually confirm device doesn't crash during boot.
Change-Id: I26da2e9a2af06e110367fc6f1127df4fddbcc678
---
 core/java/android/hardware/fingerprint/FingerprintManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 0fd164de8ffb0..715361eafde90 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -1080,7 +1080,7 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
      */
     public boolean isPowerbuttonFps() {
         final FingerprintSensorPropertiesInternal sensorProps = getFirstFingerprintSensor();
-        return sensorProps.sensorType == TYPE_POWER_BUTTON;
+        return sensorProps == null ? false : sensorProps.sensorType == TYPE_POWER_BUTTON;
     }
 
     /**