commit cf1c8860bdecd1caa4ac3d5d8715840860111479
author Kyunglyul Hyun <klhyun@google.com> Wed Mar 29 05:00:10 2023 +0000
committer Kyunglyul Hyun <klhyun@google.com> Wed Mar 29 05:45:58 2023 +0000
tree 2d252e6a778eaea468efe408c95d44f47ba2c4a1
parent 0d0026506cdbd2e7cb2d7406a901ae251988c968

Register connect callback when the service is up

Re-register connection callback when the service is up.
This could enable callbacks to work even when they're
registered before the service is up.

Tag: #feature
Bug: 274812502
Test: atest BluetoothInstrumentationTests
Change-Id: I49500cb71e816256427f56d5a3319022140fd9cc

framework/java/android/bluetooth/BluetoothAdapter.java

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index dc3648c..05a3151 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -3983,6 +3983,22 @@
                                 }
                             }
                         }
+                        synchronized (mBluetoothConnectionCallbackExecutorMap) {
+                            if (!mBluetoothConnectionCallbackExecutorMap.isEmpty()) {
+                                try {
+                                    final SynchronousResultReceiver recv =
+                                            SynchronousResultReceiver.get();
+                                    mService.registerBluetoothConnectionCallback(
+                                            mConnectionCallback,
+                                            mAttributionSource, recv);
+                                    recv.awaitResultNoInterrupt(getSyncTimeout())
+                                            .getValue(null);
+                                } catch (RemoteException | TimeoutException e) {
+                                    Log.e(TAG, "onBluetoothServiceUp: Failed to register "
+                                            + "bluetooth connection callback", e);
+                                }
+                            }
+                        }
                     } finally {
                         mServiceLock.readLock().unlock();
                     }