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

Commit f6a5bc13 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Gerrit Code Review
Browse files

Merge changes If843996a,I37774e37,I3c110bba,Ic5aeec3e 

* changes:
  floss: Add partial BleScanner topshim
  floss: Remove duplicate topshim address conversions
  floss: Update cb_variant to consume values
  floss: build: Add btm_ble_scanner and remove leaudio
parents faf41e25 0a9b2017

system/bta/BUILD.gn

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ static_library("bta") { 
    "gatt/database.cc",

    "gatt/database_builder.cc",

    "groups/groups.cc",

    # TODO(abps) - Enable with long-term effort for LE Audio

    #"has/has_client.cc",

    #"has/has_ctp.cc",

    #"has/has_preset.cc",

    #"has/has_types.cc",

    "hearing_aid/hearing_aid.cc",

    "hearing_aid/hearing_aid_audio_source.cc",

    "hf_client/bta_hf_client_act.cc",

system/btif/BUILD.gn

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ static_library("btif") { 
    "src/btif_gatt_util.cc",

    "src/btif_hd.cc",

    "src/btif_vc.cc",

    "src/btif_le_audio_broadcaster.cc",

    #"src/btif_le_audio_broadcaster.cc",

    #"src/btif_has_client.cc",

    "src/btif_hearing_aid.cc",

    "src/btif_hf.cc",

    "src/btif_hf_client.cc",

system/btif/src/bluetooth.cc

+8 −0
Original line number Diff line number Diff line
@@ -89,8 +89,10 @@ 


using bluetooth::csis::CsisClientInterface;

using bluetooth::hearing_aid::HearingAidInterface;

#ifndef TARGET_FLOSS

using bluetooth::le_audio::LeAudioBroadcasterInterface;

using bluetooth::le_audio::LeAudioClientInterface;

#endif

using bluetooth::vc::VolumeControlInterface;



/*******************************************************************************
@@ -133,10 +135,12 @@ extern const btrc_ctrl_interface_t* btif_rc_ctrl_get_interface(); 
extern const btsdp_interface_t* btif_sdp_get_interface();

/*Hearing Aid client*/

extern HearingAidInterface* btif_hearing_aid_get_interface();

#ifndef TARGET_FLOSS

/* LeAudio testi client */

extern LeAudioClientInterface* btif_le_audio_get_interface();

/* LeAudio Broadcaster */

extern LeAudioBroadcasterInterface* btif_le_audio_broadcaster_get_interface();

#endif

/* Coordinated Set Service Client */

extern CsisClientInterface* btif_csis_client_get_interface();

/* Volume Control client */
@@ -417,8 +421,10 @@ static void dump(int fd, const char** arguments) { 
  alarm_debug_dump(fd);

  bluetooth::csis::CsisClient::DebugDump(fd);

  HearingAid::DebugDump(fd);

#ifndef TARGET_FLOSS

  LeAudioClient::DebugDump(fd);

  LeAudioBroadcaster::DebugDump(fd);

#endif

  connection_manager::dump(fd);

  bluetooth::bqr::DebugDump(fd);

  bluetooth::shim::Dump(fd, arguments);
@@ -481,11 +487,13 @@ static const void* get_profile_interface(const char* profile_id) { 
    return bluetooth::activity_attribution::get_activity_attribution_instance();

  }



#ifndef TARGET_FLOSS

  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_ID))

    return btif_le_audio_get_interface();



  if (is_profile(profile_id, BT_PROFILE_LE_AUDIO_BROADCASTER_ID))

    return btif_le_audio_broadcaster_get_interface();

#endif



  if (is_profile(profile_id, BT_PROFILE_VC_ID))

    return btif_volume_control_get_interface();

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

+7 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ use bt_topshim::bindings::root::bluetooth::Uuid; 
use bt_topshim::btif::{BluetoothInterface, RawAddress, Uuid128Bit};

use bt_topshim::profiles::gatt::{

    BtGattDbElement, BtGattNotifyParams, BtGattReadParams, Gatt, GattClientCallbacks,

    GattClientCallbacksDispatcher, GattServerCallbacksDispatcher, GattStatus,

    GattClientCallbacksDispatcher, GattScannerCallbacksDispatcher, GattServerCallbacksDispatcher,

    GattStatus,

};

use bt_topshim::topstack;
@@ -514,6 +515,11 @@ impl BluetoothGatt { 
                    debug!("received Gatt server callback: {:?}", cb);

                }),

            },

            GattScannerCallbacksDispatcher {

                dispatch: Box::new(move |cb| {

                    debug!("received Gatt scanner callback: {:?}", cb);

                }),

            },

        );

    }

}

system/gd/rust/topshim/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -50,8 +50,10 @@ cc_library_static { 
        "btav_sink/btav_sink_shim.cc",

        "btif/btif_shim.cc",

        "gatt/gatt_shim.cc",

        "gatt/gatt_ble_scanner_shim.cc",

        "hfp/hfp_shim.cc",

        "controller/controller_shim.cc",

        "common/utils.cc",

    ],

    generated_headers: [

        "libbt_init_flags_bridge_header",