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

Commit 030a3080 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Throw error when notification is larger than max attribute value" into main am: 334b7721 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2709179



Change-Id: If3d55519a567449305a4f45480e58277831383ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7d9e3f0 334b7721

framework/java/android/bluetooth/BluetoothGattServer.java

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ public final class BluetoothGattServer implements BluetoothProfile { 
    private List<BluetoothGattService> mServices;



    private static final int CALLBACK_REG_TIMEOUT = 10000;

    // Max length of an attribute value, defined in gatt_api.h

    private static final int GATT_MAX_ATTR_LEN = 512;



    /**

     * Bluetooth GATT interface callbacks
@@ -829,6 +831,10 @@ public final class BluetoothGattServer implements BluetoothProfile { 
        if (device == null) {

            throw new IllegalArgumentException("device must not be null");

        }

        if (value.length > GATT_MAX_ATTR_LEN) {

            throw new IllegalArgumentException(

                    "notification should not be longer than max length of an attribute value");

        }

        BluetoothGattService service = characteristic.getService();

        if (service == null) {

            throw new IllegalArgumentException("Characteristic must have a non-null service");