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

Merge "Fix ServiceConnector failing unbind if not connected." into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-23 18:35:38 +00:00
committed by Android (Google) Code Review
parent d47ad7b279 efc50877d2
commit cbb04a4286
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() { void unbindJobThread() {
cancelTimeout(); cancelTimeout();
I service = mService; 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; 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) { if (wasBound) {
onServiceConnectionStatusChanged(service, false); onServiceConnectionStatusChanged(service, false);
mContext.unbindService(mServiceConnection);
service.asBinder().unlinkToDeath(this, 0); service.asBinder().unlinkToDeath(this, 0);
mService = null; mService = null;
} }