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

Commit 430d1b9a authored by Katherine Lai's avatar Katherine Lai Committed by Automerger Merge Worker
Browse files

Merge "floss: Add floss-only properties for LE scan params during AdvMon" into main am: 0681d4cf 

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



Change-Id: Ic9fe67a0375db532e956813aaa6d41b7732ec7a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efff0cb0 0681d4cf

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

+2 −2
Original line number Diff line number Diff line
@@ -2027,8 +2027,8 @@ impl IBluetoothGatt for BluetoothGatt { 


        // If the client is not specifying scan settings, the default one will be used.

        let settings = settings.unwrap_or_else(|| ScanSettings {

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

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

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

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

            scan_type: ScanType::default(),

        });

system/gd/rust/topshim/src/sysprop.rs

+12 −4
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ pub enum PropertyI32 { 
    // bluetooth.core.le

    LeInquiryScanInterval,

    LeInquiryScanWindow,

    LeAdvMonScanInterval,

    LeAdvMonScanWindow,



    // bluetooth.device_id

    ProductId,
@@ -21,11 +23,17 @@ impl Into<(Vec<u8>, i32)> for PropertyI32 { 
    /// Convert the property into the property key name and a default value.

    fn into(self) -> (Vec<u8>, i32) {

        let (key, default_value) = match self {

            // Inquiry scan interval  = N * 0.625 ms; value of 432 = 270ms

            PropertyI32::LeInquiryScanInterval => ("bluetooth.core.le.inquiry_scan_interval", 430),

            // Inquiry scan interval = N * 0.625 ms; value of 36 = 22.5ms

            PropertyI32::LeInquiryScanInterval => ("bluetooth.core.le.inquiry_scan_interval", 36),



            //Inquiry scan window  = N * 0.625 ms; value of 216 = 135ms

            PropertyI32::LeInquiryScanWindow => ("bluetooth.core.le.inquiry_scan_window", 216),

            //Inquiry scan window = N * 0.625 ms; value of 18 = 11.25ms

            PropertyI32::LeInquiryScanWindow => ("bluetooth.core.le.inquiry_scan_window", 18),



            // Adv Mon scan interval = N * 0.625 ms; value of 40 = 25ms

            PropertyI32::LeAdvMonScanInterval => ("bluetooth.core.le.adv_mon_scan_interval", 40),



            // Adv Mon scan window = N * 0.625 ms; value of 20 = 12.5ms

            PropertyI32::LeAdvMonScanWindow => ("bluetooth.core.le.adv_mon_scan_window", 20),



            PropertyI32::ProductId => ("bluetooth.device_id.product_id", 0),

            PropertyI32::ProductVersion => ("bluetooth.device_id.product_version", 0),

system/gd/sysprops/sysprops_module.cc

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ void SyspropsModule::parse_config(std::string file_path) { 
      "bluetooth.core.le.connection_scan_window_slow",

      "bluetooth.core.le.inquiry_scan_interval",

      "bluetooth.core.le.inquiry_scan_window",

      "bluetooth.core.le.adv_mon_scan_interval",

      "bluetooth.core.le.adv_mon_scan_window",

      "bluetooth.core.le.vendor_capabilities.enabled",

      // SCO

      "bluetooth.sco.disable_enhanced_connection",