summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ilya Matyukhin <ilyamaty@google.com> 2018-04-26 14:28:45 -0700
committer Ilya Matyukhin <ilyamaty@google.com> 2018-04-26 15:57:38 -0700
commit606f17154407bc53dd9fc894111b0927985d38cc (patch)
tree2c0b18335f9ff3f23ee9086e8f3e02a778a01d48
parent019ec44307661ea88cc0b0a38e4cdf12cbbe1941 (diff)
Add a null a check in fingerprint service
Fixes: 62918794 Test: ran the command from the bug report Change-Id: Ib00ee46f775c07be5b1e821528dd390ed978b58e
-rw-r--r--services/core/java/com/android/server/fingerprint/FingerprintService.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index ef40a1cb2def..c9f92d2534d9 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -619,6 +619,15 @@ public class FingerprintService extends SystemService implements IHwBinder.Death
void startRemove(IBinder token, int fingerId, int groupId, int userId,
IFingerprintServiceReceiver receiver, boolean restricted, boolean internal) {
+ if (token == null) {
+ Slog.w(TAG, "startRemove: token is null");
+ return;
+ }
+ if (receiver == null) {
+ Slog.w(TAG, "startRemove: receiver is null");
+ return;
+ }
+
IBiometricsFingerprint daemon = getFingerprintDaemon();
if (daemon == null) {
Slog.w(TAG, "startRemove: no fingerprint HAL!");