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

Merge "BluetoothProfileConnecter now calls the ServiceListener's onServiceDisconnected method after unbinding the service" into rvc-dev am: 248896bf98 am: d3d0f2a76d

Browse Source 
Change-Id: If4b31c82c07f9b75b4eddb1f34c77a2a6affc4c6
This commit is contained in:
Rahul Sabnis
2020-05-03 05:50:23 +00:00
committed by Automerger Merge Worker
parent da3ab10f11 d3d0f2a76d
commit f0f934cb98
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/bluetooth/BluetoothProfileConnector.java
View File

@@ -103,14 +103,21 @@ public abstract class BluetoothProfileConnector<T> {
private void doUnbind() {
synchronized (mConnection) {
if (mService != null) {
logDebug("Unbinding service...");
try {
mContext.unbindService(mConnection);
} catch (IllegalArgumentException ie) {
logError("Unable to unbind service: " + ie);
} finally {
mService = null;
try {
if (mService != null) {
logDebug("Unbinding service...");
try {
mContext.unbindService(mConnection);
} catch (IllegalArgumentException ie) {
logError("Unable to unbind service: " + ie);
} finally {
mService = null;
}
}
} finally {
if (mServiceListener != null) {
mServiceListener.onServiceDisconnected(mProfileId);
mServiceListener = null;
}
}
}
@@ -131,7 +138,6 @@ public abstract class BluetoothProfileConnector<T> {
}
void disconnect() {
mServiceListener = null;
IBluetoothManager mgr = BluetoothAdapter.getDefaultAdapter().getBluetoothManager();
if (mgr != null) {
try {