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

Commit c6ec199a authored by Ben Lawson's avatar Ben Lawson Committed by Gerrit Code Review
Browse files

Merge changes Iaa1ac88d,I7121adfa into main 

* changes:
  BumbleBluetoothTests: Add non-connectable scannable LeScanningTest
  BumbleBluetoothTests: Add non-connectable LeScanningTest
parents 25a32d1f 15ef239a

framework/tests/bumble/src/android/bluetooth/LeScanningTest.java

+71 −8
Original line number Diff line number Diff line
@@ -46,22 +46,24 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; 


import com.android.compatibility.common.util.AdoptShellPermissionsRule;



import com.google.protobuf.ByteString;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;



import pandora.HostProto;

import pandora.HostProto.AdvertiseRequest;

import pandora.HostProto.AdvertiseResponse;

import pandora.HostProto.OwnAddressType;



import java.util.ArrayList;

import java.util.List;

import java.util.concurrent.CompletableFuture;

import java.util.concurrent.TimeUnit;

import java.util.stream.Stream;



import pandora.HostProto;

import pandora.HostProto.AdvertiseRequest;

import pandora.HostProto.AdvertiseResponse;

import pandora.HostProto.OwnAddressType;



@RunWith(AndroidJUnit4.class)

public class LeScanningTest {

    private static final String TAG = "LeScanningTest";
@@ -289,6 +291,57 @@ public class LeScanningTest { 
        mLeScanner.stopScan(lastMockScanCallback);

    }



    @Test

    public void startBleScan_withNonConnectablePublicAdvertisement() {

        AdvertiseRequest.Builder requestBuilder =

                AdvertiseRequest.newBuilder()

                        .setConnectable(false)

                        .setOwnAddressType(OwnAddressType.PUBLIC);

        advertiseWithBumble(requestBuilder);



        ScanFilter scanFilter =

                new ScanFilter.Builder()

                        .setDeviceAddress(mBumble.getRemoteDevice().getAddress())

                        .build();



        List<ScanResult> results =

                startScanning(scanFilter, ScanSettings.CALLBACK_TYPE_ALL_MATCHES);



        assertThat(results).isNotNull();

        assertThat(results.get(0).isConnectable()).isFalse();

        assertThat(results.get(1).isConnectable()).isFalse();

    }



    @Test

    public void startBleScan_withNonConnectableScannablePublicAdvertisement() {

        byte[] payload = {0x02, 0x03};

        // first 2 bytes are the manufacturer ID 0x00E0 (Google) in little endian

        byte[] manufacturerData = {(byte) 0xE0, 0x00, payload[0], payload[1]};

        HostProto.DataTypes.Builder scanResponse =

                HostProto.DataTypes.newBuilder()

                        .setManufacturerSpecificData(ByteString.copyFrom(manufacturerData));



        AdvertiseRequest.Builder requestBuilder =

                AdvertiseRequest.newBuilder()

                        .setConnectable(false)

                        .setOwnAddressType(OwnAddressType.PUBLIC)

                        .setScanResponseData(scanResponse);

        advertiseWithBumble(requestBuilder);



        ScanFilter scanFilter =

                new ScanFilter.Builder()

                        .setDeviceAddress(mBumble.getRemoteDevice().getAddress())

                        .build();



        List<ScanResult> results =

                startScanning(scanFilter, ScanSettings.CALLBACK_TYPE_ALL_MATCHES);



        assertThat(results).isNotNull();

        assertThat(results.get(0).isConnectable()).isFalse();

        assertThat(results.get(0).getScanRecord().getManufacturerSpecificData(0x00E0))

                .isEqualTo(payload);

    }



    private List<ScanResult> startScanning(ScanFilter scanFilter, int callbackType) {

        CompletableFuture<List<ScanResult>> future = new CompletableFuture<>();

        List<ScanResult> scanResults = new ArrayList<>();
@@ -306,7 +359,11 @@ public class LeScanningTest { 
                        Log.i(

                                TAG,

                                "onScanResult "

                                        + "callbackType: "

                                        + "address: "

                                        + result.getDevice().getAddress()

                                        + ", connectable: "

                                        + result.isConnectable()

                                        + ", callbackType: "

                                        + callbackType

                                        + ", service uuids: "

                                        + result.getScanRecord().getServiceUuids());
@@ -342,7 +399,7 @@ public class LeScanningTest { 


    private void advertiseWithBumble(String serviceUuid, OwnAddressType addressType) {

        AdvertiseRequest.Builder requestBuilder =

                AdvertiseRequest.newBuilder().setLegacy(true).setOwnAddressType(addressType);

                AdvertiseRequest.newBuilder().setOwnAddressType(addressType);



        if (serviceUuid != null) {

            HostProto.DataTypes.Builder dataTypeBuilder = HostProto.DataTypes.newBuilder();
@@ -350,9 +407,15 @@ public class LeScanningTest { 
            requestBuilder.setData(dataTypeBuilder.build());

        }



        advertiseWithBumble(requestBuilder);

    }



    private void advertiseWithBumble(AdvertiseRequest.Builder requestBuilder) {

        // Bumble currently only supports legacy advertising.

        requestBuilder.setLegacy(true);

        // Collect and ignore responses.

        StreamObserverSpliterator<AdvertiseResponse> responseObserver =

                new StreamObserverSpliterator<>();



        mBumble.host().advertise(requestBuilder.build(), responseObserver);

    }

}