commit | 26f8b80d924746d7fe8659403f261b7f2001b7e3 | [log] [tgz] |
---|---|---|
author | Philip P. Moltmann <moltmann@google.com> | Sat Jan 12 17:02:56 2019 -0800 |
committer | Philip P. Moltmann <moltmann@google.com> | Mon Jan 14 17:08:26 2019 +0000 |
tree | 8e5c73b9752536c7f41793e7df07b30851b8e198 | |
parent | 339ecba5424fee80dd41436b66ea6491f0ee6946 [diff] |
Remove scheduled unbind if service died Otherwise the handleUnbind will try to unbind from a dead service which causes an IAE. Bug: 117779333 Test: Killed service-app while service was bound. Save death, but not IAE anymore Change-Id: Iff91feaf0656a349ba38391ea9294bda49e3e61a
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);