Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0d311b1 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Fix a deadlock in service discovery callbacks" am: 6fcd0081 am: 8cb5645a am: 19da94f0

am: 9da98e41

Change-Id: Id7b92a2761cd0cb8a20983cfe8e81870debd147d
parents d7c6fd79 9da98e41
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -654,8 +654,16 @@ public class GattService extends ProfileService {
    void onSearchCompleted(int connId, int status) throws RemoteException {
        if (DBG) Log.d(TAG, "onSearchCompleted() - connId=" + connId+ ", status=" + status);
        // Gatt DB is ready!

        // This callback was called from the jni_workqueue thread. If we make request to the stack
        // on the same thread, it might cause deadlock. Schedule request on a new thread instead.
        Thread t = new Thread(new Runnable() {
            public void run() {
                gattClientGetGattDbNative(connId);
            }
        });
        t.start();
    }

    GattDbElement GetSampleGattDbElement() {
        return new GattDbElement();