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

Commit 2bfd2a45 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix data lost during updateScanMode" am: 4b9ceca9 am: b41f119e am: 90ffd401 

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



Change-Id: I069e3cd255fb65cb092b2fe335c617c108f31a93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53476199 90ffd401

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

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,9 @@ import java.util.Objects; 
                .setScanResultType(settings.getScanResultType())

                .setReportDelay(settings.getReportDelayMillis())

                .setNumOfMatches(settings.getNumOfMatches())

                .setMatchMode(settings.getMatchMode())

                .setLegacy(settings.getLegacy())

                .setPhy(settings.getPhy())

                .build();

        return true;

    }

system/blueberry/tests/gd_sl4a/hci/le_advanced_scanning_test.py

+1 −2
Original line number Diff line number Diff line
@@ -886,9 +886,8 @@ class LeAdvancedScanningTest(GdSl4aBaseTestClass): 
        addr_type = ble_address_types["random"]

        logging.info("Start scanning for RANDOM_ADDRESS %s with address type %d and IRK %s" %

                     (RANDOM_ADDRESS, addr_type, irk.decode("utf-8")))

        self.dut.sl4a.bleSetScanSettingsScanMode(ble_scan_settings_modes['low_latency'])

        self.dut.sl4a.bleSetScanSettingsScanMode(ble_scan_settings_modes['ambient_discovery'])

        self.dut.sl4a.bleSetScanSettingsLegacy(False)

        self.dut.sl4a.bleSetScanSettingsScanMode(3)  # ambient discovery

        filter_list, scan_settings, scan_callback = generate_ble_scan_objects(self.dut.sl4a)

        # Hard code here since callback index iterates and will cause this to fail if ran

        # Second as the impl in SL4A sends this since its a single callback for broadcast.