From 7e1cb55230055b04e5c6c86deae5412dfe0799a7 Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Mon, 27 Feb 2017 17:37:32 -0800
Subject: [PATCH] Don't crash if client token is null.

Test: verify that fingerprint clients still work and that
null client no longer crashes systemui.

Fixes bug 35806157

Change-Id: Icda7fb538caf50ba44297fe8e47c35aed1275280
---
 .../java/com/android/server/fingerprint/ClientMonitor.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
         }