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

Commit b78e0401 authored by Rahul Arya's avatar Rahul Arya
Browse files

[Invisalign] Pass more callbacks down from profiles 

Bug: 254063018
Test: all existing tests

Change-Id: I249ab6dfced4bfc9eeab1b46701cc60825ecb7b9
parent 74873b7f

system/btif/include/core_callbacks.h

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#pragma once



#include "bta/include/bta_api.h"

#include "include/hardware/bluetooth.h"

#include "stack/include/btm_ble_api_types.h"

#include "types/raw_address.h"
@@ -73,6 +74,12 @@ struct CoreInterface { 
  // generic interface

  EventCallbacks* events;



  virtual void onBluetoothEnabled() = 0;

  virtual bt_status_t toggleProfile(tBTA_SERVICE_ID service_id,

                                    bool enable) = 0;

  virtual void removeDeviceFromProfiles(const RawAddress& bd_addr) = 0;

  virtual void onLinkDown(const RawAddress& bd_addr) = 0;



  CoreInterface(EventCallbacks* eventCallbacks) : events{eventCallbacks} {};



  CoreInterface(const CoreInterface&) = delete;

system/btif/src/bluetooth.cc

+83 −0
Original line number Diff line number Diff line
@@ -163,12 +163,95 @@ extern CsisClientInterface* btif_csis_client_get_interface(); 
/* Volume Control client */

extern VolumeControlInterface* btif_volume_control_get_interface();



extern bt_status_t btif_av_sink_execute_service(bool b_enable);

extern bt_status_t btif_hh_execute_service(bool b_enable);

extern bt_status_t btif_hf_client_execute_service(bool b_enable);

extern bt_status_t btif_sdp_execute_service(bool b_enable);

extern bt_status_t btif_hh_connect(const RawAddress* bd_addr);

extern bt_status_t btif_hd_execute_service(bool b_enable);



/*******************************************************************************

 *  Callbacks from bluetooth::core (see go/invisalign-bt)

 ******************************************************************************/



struct CoreInterfaceImpl : bluetooth::core::CoreInterface {

  using bluetooth::core::CoreInterface::CoreInterface;



  void onBluetoothEnabled() override {

    /* init pan */

    btif_pan_init();

  }



  bt_status_t toggleProfile(tBTA_SERVICE_ID service_id, bool enable) override {

    /* Check the service_ID and invoke the profile's BT state changed API */

    switch (service_id) {

      case BTA_HFP_SERVICE_ID:

      case BTA_HSP_SERVICE_ID: {

        bluetooth::headset::ExecuteService(enable);

      } break;

      case BTA_A2DP_SOURCE_SERVICE_ID: {

        btif_av_source_execute_service(enable);

      } break;

      case BTA_A2DP_SINK_SERVICE_ID: {

        btif_av_sink_execute_service(enable);

      } break;

      case BTA_HID_SERVICE_ID: {

        btif_hh_execute_service(enable);

      } break;

      case BTA_HFP_HS_SERVICE_ID: {

        btif_hf_client_execute_service(enable);

      } break;

      case BTA_HIDD_SERVICE_ID: {

        btif_hd_execute_service(enable);

      } break;

      case BTA_PBAP_SERVICE_ID:

      case BTA_PCE_SERVICE_ID:

      case BTA_MAP_SERVICE_ID:

      case BTA_MN_SERVICE_ID: {

        /**

         * Do nothing; these services were started elsewhere. However, we need

         * to flow through this codepath in order to properly report back the

         * local UUIDs back to adapter properties in Java. To achieve this, we

         * need to catch these service IDs in order for {@link

         * btif_in_execute_service_request} to return {@code BT_STATUS_SUCCESS},

         * so that in {@link btif_dm_enable_service} the check passes and the

         * UUIDs are allowed to be passed up into the Java layer.

         */

      } break;

      default:

        BTIF_TRACE_ERROR("%s: Unknown service %d being %s", __func__,

                         service_id, (enable) ? "enabled" : "disabled");

        return BT_STATUS_FAIL;

    }

    return BT_STATUS_SUCCESS;

  }



  void removeDeviceFromProfiles(const RawAddress& bd_addr) override {

/*special handling for HID devices */

#if (defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE))

    btif_hh_remove_device(bd_addr);

#endif

#if (defined(BTA_HD_INCLUDED) && (BTA_HD_INCLUDED == TRUE))

    btif_hd_remove_device(bd_addr);

#endif

    btif_hearing_aid_get_interface()->RemoveDevice(bd_addr);



#ifndef TARGET_FLOSS

    if (bluetooth::csis::CsisClient::IsCsisClientRunning())

      btif_csis_client_get_interface()->RemoveDevice(bd_addr);



    if (LeAudioClient::IsLeAudioClientRunning())

      btif_le_audio_get_interface()->RemoveDevice(bd_addr);



    if (VolumeControl::IsVolumeControlRunning()) {

      btif_volume_control_get_interface()->RemoveDevice(bd_addr);

    }

#endif

  }



  void onLinkDown(const RawAddress& bd_addr) override {

    btif_av_acl_disconnected(bd_addr);

  }

};



static bluetooth::core::CoreInterface* CreateInterfaceToProfiles() {

system/btif/src/btif_core.cc

+1 −2
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ void btif_enable_bluetooth_evt() { 
  /* init rfcomm & l2cap api */

  btif_sock_init(uid_set);



  /* init pan */

  btif_pan_init();

  GetInterfaceToProfiles()->onBluetoothEnabled();



  /* load did configuration */

  bte_load_did_conf(BTE_DID_CONF_FILE);

system/btif/src/btif_dm.cc

+8 −76
Original line number Diff line number Diff line
@@ -262,19 +262,8 @@ static void btif_stats_add_bond_event(const RawAddress& bd_addr, 
/******************************************************************************

 *  Externs

 *****************************************************************************/

extern bt_status_t btif_av_sink_execute_service(bool b_enable);

extern bt_status_t btif_hh_execute_service(bool b_enable);

extern bt_status_t btif_hf_client_execute_service(bool b_enable);

extern bt_status_t btif_sdp_execute_service(bool b_enable);

extern bt_status_t btif_hh_connect(const RawAddress* bd_addr);

extern bt_status_t btif_hd_execute_service(bool b_enable);

extern bluetooth::hearing_aid::HearingAidInterface*

btif_hearing_aid_get_interface();

extern bluetooth::csis::CsisClientInterface* btif_csis_client_get_interface();

extern bluetooth::le_audio::LeAudioClientInterface*

btif_le_audio_get_interface();

extern bluetooth::vc::VolumeControlInterface*

btif_volume_control_get_interface();



/******************************************************************************

 *  Functions
@@ -304,54 +293,15 @@ void btif_dm_cleanup(void) { 
bt_status_t btif_in_execute_service_request(tBTA_SERVICE_ID service_id,

                                            bool b_enable) {

  BTIF_TRACE_DEBUG("%s service_id: %d", __func__, service_id);

  /* Check the service_ID and invoke the profile's BT state changed API */

  switch (service_id) {

    case BTA_HFP_SERVICE_ID:

    case BTA_HSP_SERVICE_ID: {

      bluetooth::headset::ExecuteService(b_enable);

    } break;

    case BTA_A2DP_SOURCE_SERVICE_ID: {

      btif_av_source_execute_service(b_enable);

    } break;

    case BTA_A2DP_SINK_SERVICE_ID: {

      btif_av_sink_execute_service(b_enable);

    } break;

    case BTA_HID_SERVICE_ID: {

      btif_hh_execute_service(b_enable);

    } break;

    case BTA_HFP_HS_SERVICE_ID: {

      btif_hf_client_execute_service(b_enable);

    } break;

    case BTA_SDP_SERVICE_ID: {



  if (service_id == BTA_SDP_SERVICE_ID) {

    btif_sdp_execute_service(b_enable);

    } break;

    case BTA_HIDD_SERVICE_ID: {

      btif_hd_execute_service(b_enable);

    } break;

    case BTA_PBAP_SERVICE_ID:

      FALLTHROUGH_INTENDED; /* FALLTHROUGH */

    case BTA_PCE_SERVICE_ID:

      FALLTHROUGH_INTENDED; /* FALLTHROUGH */

    case BTA_MAP_SERVICE_ID:

      FALLTHROUGH_INTENDED; /* FALLTHROUGH */

    case BTA_MN_SERVICE_ID: {

      /**

       * Do nothing; these services were started elsewhere. However, we need to flow through this

       * codepath in order to properly report back the local UUIDs back to adapter properties in

       * Java. To achieve this, we need to catch these service IDs in order for {@link

       * btif_in_execute_service_request} to return {@code BT_STATUS_SUCCESS}, so that in {@link

       * btif_dm_enable_service} the check passes and the UUIDs are allowed to be passed up into

       * the Java layer.

       */

    } break;

    default:

      BTIF_TRACE_ERROR("%s: Unknown service %d being %s", __func__, service_id,

                       (b_enable) ? "enabled" : "disabled");

      return BT_STATUS_FAIL;

  }

    return BT_STATUS_SUCCESS;

  }



  return GetInterfaceToProfiles()->toggleProfile(service_id, b_enable);

}



/*******************************************************************************

 *

 * Function         check_eir_remote_name
@@ -1839,25 +1789,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
      btm_set_bond_type_dev(p_data->link_down.bd_addr,

                            tBTM_SEC_DEV_REC::BOND_TYPE_UNKNOWN);



/*special handling for HID devices */

#if (defined(BTA_HH_INCLUDED) && (BTA_HH_INCLUDED == TRUE))

      btif_hh_remove_device(bd_addr);

#endif

#if (defined(BTA_HD_INCLUDED) && (BTA_HD_INCLUDED == TRUE))

      btif_hd_remove_device(bd_addr);

#endif

      btif_hearing_aid_get_interface()->RemoveDevice(bd_addr);



      if (bluetooth::csis::CsisClient::IsCsisClientRunning())

        btif_csis_client_get_interface()->RemoveDevice(bd_addr);



      if (LeAudioClient::IsLeAudioClientRunning())

        btif_le_audio_get_interface()->RemoveDevice(bd_addr);



      if (VolumeControl::IsVolumeControlRunning()) {

        btif_volume_control_get_interface()->RemoveDevice(bd_addr);

      }



      GetInterfaceToProfiles()->removeDeviceFromProfiles(bd_addr);

      btif_storage_remove_bonded_device(&bd_addr);

      bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_NONE);

      break;
@@ -1890,7 +1822,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
      bd_addr = p_data->link_down.bd_addr;

      btm_set_bond_type_dev(p_data->link_down.bd_addr,

                            tBTM_SEC_DEV_REC::BOND_TYPE_UNKNOWN);

      btif_av_acl_disconnected(bd_addr);

      GetInterfaceToProfiles()->onLinkDown(bd_addr);



      bt_conn_direction_t direction;

      switch (btm_get_acl_disc_reason_code()) {

system/test/common/core_interface.cc

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,12 @@ static bluetooth::core::EventCallbacks eventCallbacks = { 
    .invoke_link_quality_report_cb = invoke_link_quality_report_cb};



struct MockCoreInterface : bluetooth::core::CoreInterface {

  void onBluetoothEnabled() override{};

  bt_status_t toggleProfile(tBTA_SERVICE_ID service_id, bool enable) override {

    return BT_STATUS_SUCCESS;

  };

  void removeDeviceFromProfiles(const RawAddress& bd_addr) override{};

  void onLinkDown(const RawAddress& bd_addr) override{};

  MockCoreInterface() : bluetooth::core::CoreInterface{&eventCallbacks} {};

};