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

Commit 23263b20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ib923c7a6,Iae0b01d5 am: 3fe963f6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2408872



Change-Id: I643d068a15c6eda36aac1e92f416a347fd9b445a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38e4b627 3fe963f6

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

+2 −1
Original line number Diff line number Diff line
@@ -1869,7 +1869,8 @@ public class GattService extends ProfileService { 
                continue;

            }



            BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address);

            BluetoothDevice device =

                BluetoothAdapter.getDefaultAdapter().getRemoteLeDevice(address, addressType);



            ScanSettings settings = client.settings;

            byte[] scanRecordData;

android/pandora/test/example.py

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ class ExampleTest(base_test.BaseTestClass): 
    # Here we check that no matter the address type we use for both sides

    # the connection still complete.

    @avatar.parameterized([

        (OwnAddressType.RANDOM, OwnAddressType.RANDOM),

        (OwnAddressType.RANDOM, OwnAddressType.PUBLIC),

    ])

    def test_le_connect(self, dut_address_type: OwnAddressType, ref_address_type: OwnAddressType):