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

Commit c2dd4a4a authored by Hemant Gupta's avatar Hemant Gupta Committed by William Escande
Browse files

Fix construction of Transport Discovery AD type in Advertisements 

Transport Discovery data AD type is part of Android SDK
API now. Hence, Transport Discovery AD type is removed
while constructing Advertisement data.

"Transport Discovery" AD type is also an input of SDK API (Refer API comment and implementation)
https://cs.android.com/android/platform/superproject/+/master:packages/modules/Bluetooth/framework/
java/android/bluetooth/le/AdvertiseData.java;drc=d0e4f634;l=311
So, this AD type (needed in LTV format of adv data) for Transport discovery should not be constructed
in AdvertiseHelper.java

Bug: 262744495
Test: manual end to end testing
Change-Id: I270d2c82433cf2f779f5d2dcf7e9bda94b158b90
parent 7a736e67

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);