Merge "DO NOT MERGE ANYWHERE" into cw-e-dev am: 560033035b -s ours

[android-x86/system-bt.git] / service / gatt_server.cpp

diff --git a/service/gatt_server.cpp b/service/gatt_server.cpp
index 753efca..e70f093 100644 (file)
--- a/service/gatt_server.cpp
+++ b/service/gatt_server.cpp
@@ -1008,9 +1008,7 @@ void GattServerFactory::RegisterServerCallback(
   if (status == BT_STATUS_SUCCESS) {
     server.reset(new GattServer(uuid, server_id));
 
-    // Use the unsafe variant to register this as an observer to prevent a
-    // deadlock since this callback is currently holding the lock.
-    gatt_iface->AddServerObserverUnsafe(server.get());
+    gatt_iface->AddServerObserver(server.get());
 
     result = BLE_STATUS_SUCCESS;
   }