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

Commit 3f5eaed1 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge changes Ic5280480,I8277abad into main am: d88ff72c am: 36127c5c 

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



Change-Id: I8a91d28331221f6aab443a8d2998ac40db68412a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f9d3b4e7 36127c5c

system/gd/hci/le_scanning_manager.cc

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ struct LeScanningManager::impl : public LeAddressManagerCallback { 
    // with hardware-filtering features should we ignore waiting for scan response, and make sure

    // scan responses are still reported too.

    scanning_reassembler_.SetIgnoreScanResponses(

        le_scan_type_ == LeScanType::PASSIVE ||

        filter_policy_ == LeScanningFilterPolicy::FILTER_ACCEPT_LIST_ONLY);



    std::optional<LeScanningReassembler::CompleteAdvertisingData> processed_report =

system/gd/rust/linux/stack/src/bluetooth_gatt.rs

+2 −2
Original line number Diff line number Diff line
@@ -1173,7 +1173,7 @@ pub enum ScanType { 


impl Default for ScanType {

    fn default() -> Self {

        ScanType::Active

        ScanType::Passive

    }

}
@@ -2057,7 +2057,7 @@ impl IBluetoothGatt for BluetoothGatt { 
        let settings = settings.unwrap_or_else(|| ScanSettings {

            interval: sysprop::get_i32(sysprop::PropertyI32::LeInquiryScanInterval),

            window: sysprop::get_i32(sysprop::PropertyI32::LeInquiryScanWindow),

            scan_type: ScanType::Active,

            scan_type: ScanType::default(),

        });



        // Multiplexing scanners happens at this layer. The implementations of start_scan