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

Commit 0d548eb2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix construction of Transport Discovery AD type in Advertisements"

parents bf93ee1c c2dd4a4a

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

+1 −3
Original line number Diff line number Diff line
@@ -220,9 +220,7 @@ class AdvertiseHelper { 
        }



        for (TransportDiscoveryData transportDiscoveryData : data.getTransportDiscoveryData()) {

            check_length(TRANSPORT_DISCOVERY_DATA, transportDiscoveryData.totalBytes() + 1);

            ret.write(transportDiscoveryData.totalBytes() + 1);

            ret.write(TRANSPORT_DISCOVERY_DATA);

            ret.write(transportDiscoveryData.totalBytes());

            ret.write(transportDiscoveryData.toByteArray(),

                    0, transportDiscoveryData.totalBytes());

        }

android/app/tests/unit/src/com/android/bluetooth/gatt/AdvertiseHelperTest.java

+2 −2
Original line number Diff line number Diff line
@@ -69,14 +69,14 @@ public class AdvertiseHelperTest { 
                .build();

        String deviceName = "TestDeviceName";



        int expectedAdvDataBytesLength = 87;

        int expectedAdvDataBytesLength = 86;

        byte[] advDataBytes = AdvertiseHelper.advertiseDataToBytes(advertiseData, deviceName);



        String deviceNameLong = "TestDeviceNameLongTestDeviceName";



        assertThat(advDataBytes.length).isEqualTo(expectedAdvDataBytesLength);



        int expectedAdvDataBytesLongNameLength = 99;

        int expectedAdvDataBytesLongNameLength = 98;

        byte[] advDataBytesLongName = AdvertiseHelper

                .advertiseDataToBytes(advertiseData, deviceNameLong);