summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-21 17:53:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-10-21 17:53:53 +0000
commitcf8bf2f3b142f5aad0e7abe7e81bd9535f37fd7d (patch)
treec9e8dd36d567cf50254d1e488d59a847da11c31e
parent1cd25dbb67ddeb180e8b7a599b7e1edea82e5648 (diff)
parent59f3c0978ba247e6062b4b221b449e0ef5728451 (diff)
Merge "Fix possible NPE in FingerprintManager."
-rw-r--r--core/java/android/hardware/fingerprint/FingerprintManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 7b800d1ff331..5403f089b308 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;
}
/**