diff --git a/services/core/java/com/android/server/fingerprint/ClientMonitor.java b/services/core/java/com/android/server/fingerprint/ClientMonitor.java index 5a1e44574e134..43bb21d2b44a8 100644 --- a/services/core/java/com/android/server/fingerprint/ClientMonitor.java +++ b/services/core/java/com/android/server/fingerprint/ClientMonitor.java @@ -68,7 +68,9 @@ public abstract class ClientMonitor implements IBinder.DeathRecipient { mIsRestricted = restricted; mOwner = owner; try { - token.linkToDeath(this, 0); + if (token != null) { + token.linkToDeath(this, 0); + } } catch (RemoteException e) { Slog.w(TAG, "caught remote exception in linkToDeath: ", e); }