commit 4a09436a63ba29888c39ba7ac631c6473f349a66
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jan 14 18:26:54 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 14 18:26:54 2019 +0000
tree 9da7781d2aba20832ad37a87ccdfdb0bc629e34f
parent 726a71c0db4f4c842394e9251c90093402f9c3fd
parent 26f8b80d924746d7fe8659403f261b7f2001b7e3

Merge "Remove scheduled unbind if service died"

core/java/com/android/internal/infra/AbstractRemoteService.java

diff --git a/core/java/com/android/internal/infra/AbstractRemoteService.java b/core/java/com/android/internal/infra/AbstractRemoteService.java
index e8ac223..5945958 100644
--- a/core/java/com/android/internal/infra/AbstractRemoteService.java
+++ b/core/java/com/android/internal/infra/AbstractRemoteService.java
@@ -213,6 +213,7 @@
         }
         mService = null;
         mServiceDied = true;
+        cancelScheduledUnbind();
         @SuppressWarnings("unchecked") // TODO(b/117779333): fix this warning
         final S castService = (S) this;
         mVultureCallback.onServiceDied(castService);