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

Commit 9d1552a5 authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Add server-side callback for change in MTU (3/4) 

When a client requests to update the LE transport MTU, the server
currently does not get notified and can therefor not properly size
notifications appropriate to the current MTU.

Bug: 18388114
Change-Id: Ie075871cbc643bd3840e9ab472706f1565b74467
parent 9c5a7cee

android/app/jni/com_android_bluetooth_gatt.cpp

+11 −1
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static jmethodID method_onAttributeWrite; 
static jmethodID method_onExecuteWrite;

static jmethodID method_onNotificationSent;

static jmethodID method_onServerCongestion;

static jmethodID method_onServerMtuChanged;



/**

 * Static variables
@@ -774,6 +775,13 @@ void btgatts_congestion_cb(int conn_id, bool congested) 
    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

}



void btgatts_mtu_changed_cb(int conn_id, int mtu)

{

    CHECK_CALLBACK_ENV

    sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onServerMtuChanged, conn_id, mtu);

    checkAndClearExceptionFromCallback(sCallbackEnv, __FUNCTION__);

}



static const btgatt_server_callbacks_t sGattServerCallbacks = {

    btgatts_register_app_cb,

    btgatts_connection_cb,
@@ -789,7 +797,8 @@ static const btgatt_server_callbacks_t sGattServerCallbacks = { 
    btgatts_request_exec_write_cb,

    btgatts_response_confirmation_cb,

    btgatts_indication_sent_cb,

    btgatts_congestion_cb

    btgatts_congestion_cb,

    btgatts_mtu_changed_cb

};



/**
@@ -859,6 +868,7 @@ static void classInitNative(JNIEnv* env, jclass clazz) { 
    method_onExecuteWrite= env->GetMethodID(clazz, "onExecuteWrite", "(Ljava/lang/String;III)V");

    method_onNotificationSent = env->GetMethodID(clazz, "onNotificationSent", "(II)V");

    method_onServerCongestion = env->GetMethodID(clazz, "onServerCongestion", "(IZ)V");

    method_onServerMtuChanged = env->GetMethodID(clazz, "onMtuChanged", "(II)V");



    info("classInitNative: Success!");

}

android/app/src/com/android/bluetooth/gatt/GattService.java

+13 −7
Original line number Diff line number Diff line
@@ -1688,9 +1688,6 @@ public class GattService extends ProfileService { 
        HandleMap.Entry entry = mHandleMap.getByHandle(attrHandle);

        if (entry == null) return;



        if (DBG) Log.d(TAG, "onAttributeRead() UUID=" + entry.uuid

            + ", serverIf=" + entry.serverIf + ", type=" + entry.type);



        mHandleMap.addRequest(transId, attrHandle);



        ServerMap.App app = mServerMap.getById(entry.serverIf);
@@ -1738,9 +1735,6 @@ public class GattService extends ProfileService { 
        HandleMap.Entry entry = mHandleMap.getByHandle(attrHandle);

        if (entry == null) return;



        if (DBG) Log.d(TAG, "onAttributeWrite() UUID=" + entry.uuid

            + ", serverIf=" + entry.serverIf + ", type=" + entry.type);



        mHandleMap.addRequest(transId, attrHandle);



        ServerMap.App app = mServerMap.getById(entry.serverIf);
@@ -1793,7 +1787,7 @@ public class GattService extends ProfileService { 
    }



    void onNotificationSent(int connId, int status) throws RemoteException {

        if (DBG) Log.d(TAG, "onNotificationSent() connId=" + connId + ", status=" + status);

        if (VDBG) Log.d(TAG, "onNotificationSent() connId=" + connId + ", status=" + status);



        String address = mServerMap.addressByConnId(connId);

        if (address == null) return;
@@ -1825,6 +1819,18 @@ public class GattService extends ProfileService { 
        }

    }



    void onMtuChanged(int connId, int mtu) throws RemoteException {

        if (DBG) Log.d(TAG, "onMtuChanged() - connId=" + connId + ", mtu=" + mtu);



        String address = mServerMap.addressByConnId(connId);

        if (address == null) return;



        ServerMap.App app = mServerMap.getByConnId(connId);

        if (app == null) return;



        app.callback.onMtuChanged(address, mtu);

    }



    /**************************************************************************

     * GATT Service functions - SERVER

     *************************************************************************/