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

Commit dfd827e4 authored by Tom Turney's avatar Tom Turney Committed by Android Git Automerger
Browse files

am e9f8d1dd: am 2a46722f: Merge "Feature request: Increasing advertise data... 

am e9f8d1dd: am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisem

* commit 'e9f8d1dd':
  Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
parents e9196c94 e9f8d1dd

core/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+6 −4
Original line number Diff line number Diff line
@@ -117,8 +117,9 @@ public final class BluetoothLeAdvertiser { 
                        AdvertiseCallback.ADVERTISE_FAILED_FEATURE_UNSUPPORTED);

                return;

            }

            if (totalBytes(advertiseData) > MAX_ADVERTISING_DATA_BYTES ||

                    totalBytes(scanResponse) > MAX_ADVERTISING_DATA_BYTES) {

            boolean isConnectable = settings.isConnectable();

            if (totalBytes(advertiseData, isConnectable) > MAX_ADVERTISING_DATA_BYTES ||

                    totalBytes(scanResponse, isConnectable) > MAX_ADVERTISING_DATA_BYTES) {

                postStartFailure(callback, AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE);

                return;

            }
@@ -171,9 +172,10 @@ public final class BluetoothLeAdvertiser { 
    }



    // Compute the size of the advertise data.

    private int totalBytes(AdvertiseData data) {

    private int totalBytes(AdvertiseData data, boolean isConnectable) {

        if (data == null) return 0;

        int size = FLAGS_FIELD_BYTES; // flags field is always set.

        // Flags field is omitted if the advertising is not connectable.

        int size = isConnectable ? FLAGS_FIELD_BYTES : 0;

        if (data.getServiceUuids() != null) {

            int num16BitUuids = 0;

            int num32BitUuids = 0;