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

Commit b45c38ac authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Git Automerger
Browse files

am fcb94852: am a1a6c300: Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev 

* commit 'fcb94852':
  Add server-side callback for change in MTU (4/4)
parents f2d68c88 fcb94852

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -6383,6 +6383,7 @@ package android.bluetooth { 
    method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);

    method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);

    method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);

    method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);

    method public void onExecuteWrite(android.bluetooth.BluetoothDevice, int, boolean);

    method public void onExecuteWrite(android.bluetooth.BluetoothDevice, int, boolean);

    method public void onMtuChanged(android.bluetooth.BluetoothDevice, int);

    method public void onNotificationSent(android.bluetooth.BluetoothDevice, int);

    method public void onNotificationSent(android.bluetooth.BluetoothDevice, int);

    method public void onServiceAdded(int, android.bluetooth.BluetoothGattService);

    method public void onServiceAdded(int, android.bluetooth.BluetoothGattService);

  }

  }

core/java/android/bluetooth/BluetoothGattServer.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -284,6 +284,24 @@ public final class BluetoothGattServer implements BluetoothProfile { 
                    Log.w(TAG, "Unhandled exception: " + ex);

                    Log.w(TAG, "Unhandled exception: " + ex);

                }

                }

            }

            }



            /**

             * The MTU for a connection has changed

             * @hide

             */

            public void onMtuChanged(String address, int mtu) {

                if (DBG) Log.d(TAG, "onMtuChanged() - "

                    + "device=" + address + ", mtu=" + mtu);



                BluetoothDevice device = mAdapter.getRemoteDevice(address);

                if (device == null) return;



                try {

                    mCallback.onMtuChanged(device, mtu);

                } catch (Exception ex) {

                    Log.w(TAG, "Unhandled exception: " + ex);

                }

            }

        };

        };





    /**

    /**

core/java/android/bluetooth/BluetoothGattServerCallback.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -145,4 +145,16 @@ public abstract class BluetoothGattServerCallback { 
     */

     */

    public void onNotificationSent(BluetoothDevice device, int status) {

    public void onNotificationSent(BluetoothDevice device, int status) {

    }

    }



    /**

     * Callback indicating the MTU for a given device connection has changed.

     *

     * <p>This callback will be invoked if a remote client has requested to change

     * the MTU for a given connection.

     *

     * @param device The remote device that requested the MTU change

     * @param mtu The new MTU size

     */

    public void onMtuChanged(BluetoothDevice device, int mtu) {

    }

}
 
}

core/java/android/bluetooth/IBluetoothGattServerCallback.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -59,4 +59,5 @@ oneway interface IBluetoothGattServerCallback { 
                                     in byte[] value);

                                     in byte[] value);

    void onExecuteWrite(in String address, in int transId, in boolean execWrite);

    void onExecuteWrite(in String address, in int transId, in boolean execWrite);

    void onNotificationSent(in String address, in int status);

    void onNotificationSent(in String address, in int status);

    void onMtuChanged(in String address, in int mtu);

}
 
}