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

Commit ad8ea7fd authored by Prerepa Viswanadham's avatar Prerepa Viswanadham Committed by Android Git Automerger
Browse files

am 76552bb9: am e179b568: Don\'t compute flags length for scan response 

* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
  Don't compute flags length for scan response
parents 8d8f1b8b e179b568

framework/java/android/bluetooth/le/BluetoothLeAdvertiser.java

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public final class BluetoothLeAdvertiser { 
            }

            boolean isConnectable = settings.isConnectable();

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

                    totalBytes(scanResponse, isConnectable) > MAX_ADVERTISING_DATA_BYTES) {

                    totalBytes(scanResponse, false) > MAX_ADVERTISING_DATA_BYTES) {

                postStartFailure(callback, AdvertiseCallback.ADVERTISE_FAILED_DATA_TOO_LARGE);

                return;

            }
@@ -171,11 +171,11 @@ public final class BluetoothLeAdvertiser { 
        mLeAdvertisers.clear();

    }



    // Compute the size of the advertise data.

    private int totalBytes(AdvertiseData data, boolean isConnectable) {

    // Compute the size of advertisement data or scan resp

    private int totalBytes(AdvertiseData data, boolean isFlagsIncluded) {

        if (data == null) return 0;

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

        int size = isConnectable ? FLAGS_FIELD_BYTES : 0;

        int size = (isFlagsIncluded) ? FLAGS_FIELD_BYTES : 0;

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

            int num16BitUuids = 0;

            int num32BitUuids = 0;