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

Merge "Register the service-to-app callback whenever the service comes up for BluetoothConnectionCallback. This ensures that if the bluetooth process dies, the callbacks will be re-established once it comes back up." am: 0aa6ab7887 am: 7d10fee593

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic60e9efe84a5009c7fd0112c8ab92cae2973d77c
This commit is contained in:
Treehugger Robot
2020-12-21 21:58:44 +00:00
committed by Automerger Merge Worker
parent 2aa7d539d3 7d10fee593
commit 5e50fd7970
1 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -2933,6 +2933,16 @@ public final class BluetoothAdapter {
}
});
}
synchronized (mBluetoothConnectionCallbackExecutorMap) {
if (!mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
try {
mService.registerBluetoothConnectionCallback(mConnectionCallback);
} catch (RemoteException e) {
Log.e(TAG, "onBluetoothServiceUp: Failed to register bluetooth"
+ "connection callback", e);
}
}
}
}
public void onBluetoothServiceDown() {
@@ -3582,25 +3592,25 @@ public final class BluetoothAdapter {
return false;
}
// If the callback map is empty, we register the service-to-app callback
if (mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
try {
mServiceLock.readLock().lock();
if (mService != null) {
if (!mService.registerBluetoothConnectionCallback(mConnectionCallback)) {
return false;
}
}
} catch (RemoteException e) {
Log.e(TAG, "", e);
mBluetoothConnectionCallbackExecutorMap.remove(callback);
} finally {
mServiceLock.readLock().unlock();
}
}
// Adds the passed in callback to our map of callbacks to executors
synchronized (mBluetoothConnectionCallbackExecutorMap) {
// If the callback map is empty, we register the service-to-app callback
if (mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
try {
mServiceLock.readLock().lock();
if (mService != null) {
if (!mService.registerBluetoothConnectionCallback(mConnectionCallback)) {
return false;
}
}
} catch (RemoteException e) {
Log.e(TAG, "", e);
mBluetoothConnectionCallbackExecutorMap.remove(callback);
} finally {
mServiceLock.readLock().unlock();
}
}
// Adds the passed in callback to our map of callbacks to executors
if (mBluetoothConnectionCallbackExecutorMap.containsKey(callback)) {
throw new IllegalArgumentException("This callback has already been registered");
}