Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerge] Fix ServiceConnector failing unbind if not connected. 2p: efc50877d2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17321988


Change-Id: If7c0bf7ab6c89e98bdecbc1ef98bf93313fa8176
Merged-In: I6a8c01390130bcec9aff1460004343ca2b207031
This commit is contained in:
Presubmit Automerger Backend
2022-03-23 09:33:53 +00:00
parent 16294cce9e efc50877d2
commit 34f0951f96
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/com/android/internal/infra/ServiceConnector.java
View File

@@ -507,10 +507,21 @@ public interface ServiceConnector<I extends IInterface> {
void unbindJobThread() {
cancelTimeout();
I service = mService;
// TODO(b/224695239): This is actually checking wasConnected. Rename and/or fix
// implementation based on what this should actually be checking. At least the first
// check for calling unbind is the correct behavior, though.
boolean wasBound = service != null;
if (wasBound || mBinding) {
try {
mContext.unbindService(mServiceConnection);
} catch (IllegalArgumentException e) { // TODO(b/224697137): Fix the race condition
// that requires catching this (crashes if
// service isn't currently bound).
Log.e(LOG_TAG, "Failed to unbind: " + e);
}
}
if (wasBound) {
onServiceConnectionStatusChanged(service, false);
mContext.unbindService(mServiceConnection);
service.asBinder().unlinkToDeath(this, 0);
mService = null;
}