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

Commit 620c7df2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ia31171fa,I1a8fb374 am: a3b62b2a am: a77012ba 

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



Change-Id: I177fa3aa7c7a4a932cd3f605d5e087c09ba4ac4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4616da46 a77012ba

system/Android.bp

+17 −0
Original line number Diff line number Diff line
@@ -182,3 +182,20 @@ genrule { 
        "blueberry/facade/topshim/facade_pb2_grpc.py",

    ],

}



// Export system headers for rules that can't simply use `include_dirs`

cc_library_headers {

    name: "libbluetooth_system_headers",

    defaults: ["libchrome_support_defaults"],

    visibility: [

        "//packages/modules/Bluetooth/system:__subpackages__",

    ],

    export_include_dirs: ["./"],

    vendor_available: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

        "com.android.btservices",

    ],

    min_sdk_version: "30",

}

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ table InitFlagsData { 
    btaa_hci_is_enabled:bool (privacy:"Any");

    bta_dm_clear_conn_id_on_client_close_is_enabled:bool (privacy:"Any");

    btm_dm_flush_discovery_queue_on_search_cancel_is_enabled:bool (privacy:"Any");

    classic_discovery_only_is_enabled:bool (privacy:"Any");

    clear_hidd_interrupt_cid_on_disconnect_is_enabled:bool (privacy:"Any");

    delay_hidh_cleanup_until_hidh_ready_start_is_enabled:bool (privacy:"Any");

    device_iot_config_logging_is_enabled:bool (privacy:"Any");

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
      initFlags::btm_dm_flush_discovery_queue_on_search_cancel_is_enabled());

  builder.add_device_iot_config_logging_is_enabled(

      initFlags::device_iot_config_logging_is_enabled());

  builder.add_classic_discovery_only_is_enabled(initFlags::classic_discovery_only_is_enabled());

  builder.add_clear_hidd_interrupt_cid_on_disconnect_is_enabled(

      initFlags::clear_hidd_interrupt_cid_on_disconnect_is_enabled());

  builder.add_delay_hidh_cleanup_until_hidh_ready_start_is_enabled(

system/gd/rust/common/src/init_flags.rs

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ init_flags!( 
        btaa_hci = true,

        bta_dm_clear_conn_id_on_client_close = true,

        btm_dm_flush_discovery_queue_on_search_cancel,

        classic_discovery_only,

        clear_hidd_interrupt_cid_on_disconnect = true,

        delay_hidh_cleanup_until_hidh_ready_start = true,

        device_iot_config_logging,

system/gd/rust/linux/service/src/main.rs

+6 −2
Original line number Diff line number Diff line
@@ -127,6 +127,9 @@ fn main() -> Result<(), Box<dyn Error>> { 
    // Forward --hci to Fluoride.

    init_flags.push(format!("--hci={}", hci_index));



    // Always treat discovery as classic only

    init_flags.push(String::from("INIT_classic_discovery_only=true"));



    let (tx, rx) = Stack::create_channel();

    let sig_notifier = Arc::new((Mutex::new(false), Condvar::new()));
@@ -156,10 +159,11 @@ fn main() -> Result<(), Box<dyn Error>> { 
    let bluetooth = Arc::new(Mutex::new(Box::new(Bluetooth::new(

        adapter_index,

        tx.clone(),

        intf.clone(),

        bluetooth_media.clone(),

        sig_notifier.clone(),

        intf.clone(),

        bluetooth_admin.clone(),

        bluetooth_gatt.clone(),

        bluetooth_media.clone(),

    ))));

    let suspend = Arc::new(Mutex::new(Box::new(Suspend::new(

        bluetooth.clone(),