Merge "Don't crash if client token is null."

2017-02-28 22:06:15 +00:00
parent cb9fe89197 7e1cb55230
commit d92eee2344
1 changed files with 3 additions and 1 deletions
--- 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);
        }