commit 04820a5e65dda9c9e771f5bd5bae4c7ebeeaaa02
author Adam He <adamhe@google.com> Wed Apr 10 12:25:55 2019 -0700
committer Adam He <adamhe@google.com> Wed Apr 10 12:25:55 2019 -0700
tree ab199959f93fc461c0967f4c0f8a5b370f0d7da4
parent 568b02ee004850ba21b07e377980b77823746aa8

Sets vulture to null to prevent crashes caused by unlinkToDeath.

Fixes: 130215863
Bug: 129250887
Test: manual verification
Change-Id: I62e8f742869967b6a4e1f56aa82f3e17ae99b16f

services/autofill/java/com/android/server/autofill/Session.java

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 0402b8f..afb8a15 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -704,6 +704,7 @@
             mClient.asBinder().linkToDeath(mClientVulture, 0);
         } catch (RemoteException e) {
             Slog.w(TAG, "could not set binder death listener on autofill client: " + e);
+            mClientVulture = null;
         }
     }
 
@@ -714,6 +715,7 @@
             if (!unlinked) {
                 Slog.w(TAG, "unlinking vulture from death failed for " + mActivityToken);
             }
+            mClientVulture = null;
         }
     }