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 tm-dev

Browse Source
This commit is contained in:
Ahaan Ugale
2022-03-15 20:36:51 +00:00
committed by Android (Google) Code Review
parent 8b50a56841 52e0dafcb3
commit 0ede4b88ff
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import android.os.Looper;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.Log;
import android.util.Slog;
import java.io.PrintWriter;
import java.util.ArrayDeque;
@@ -562,10 +563,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).
Slog.e(LOG_TAG, "Failed to unbind: " + e);
}
}
if (wasBound) {
dispatchOnServiceConnectionStatusChanged(service, false);
mContext.unbindService(mServiceConnection);
service.asBinder().unlinkToDeath(this, 0);
mService = null;
}