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

Commit 44e77ed3 authored by weichinweng's avatar weichinweng Committed by Weichin Weng
Browse files

ASHA: Enhance ASHA connection flow 

1) Move set PHY and set data length action before creating BLE CoC
   connection.
2) Open session when the connection update completed
3) Make sure the phy is 2M if remote support PHY 2M.

Tag: #feature
Bug: 226039608
Bug: 221061656
Bug: 231095722
Test: manual
Change-Id: Ia71fee66ff914e2eb352daa3c4b78dace0412ded
parent 2c6d8a46

system/bta/hearing_aid/hearing_aid.cc

+53 −12
Original line number Diff line number Diff line
@@ -402,15 +402,6 @@ class HearingAidImpl : public HearingAid { 
      hearingDevice->connection_update_status = AWAITING;

    }



    if (controller_get_interface()->supports_ble_2m_phy()) {

      LOG(INFO) << address << " set preferred PHY to 2M";

      BTM_BleSetPhy(address, PHY_LE_2M, PHY_LE_2M, 0);

    }



    // Set data length

    // TODO(jpawlowski: for 16khz only 87 is required, optimize

    BTM_SetBleDataLength(address, 167);



    if (BTM_SecIsSecurityPending(address)) {

      /* if security collision happened, wait for encryption done

       * (BTA_GATTC_ENC_CMPL_CB_EVT) */
@@ -510,6 +501,12 @@ class HearingAidImpl : public HearingAid { 
      hearingDevice->connection_update_status = NONE;

    }



    if (!hearingDevice->accepting_audio &&

        hearingDevice->connection_update_status == COMPLETED &&

        hearingDevice->gap_opened) {

      OnDeviceReady(hearingDevice->address);

    }



    for (auto& device : hearingDevices.devices) {

      if (device.conn_id && (device.connection_update_status == AWAITING)) {

        device.connection_update_status = STARTED;
@@ -578,6 +575,24 @@ class HearingAidImpl : public HearingAid { 
    }

  }



  void OnPhyUpdateEvent(uint16_t conn_id, uint8_t tx_phys, uint8_t rx_phys,

                        tGATT_STATUS status) {

    HearingDevice* hearingDevice = hearingDevices.FindByConnId(conn_id);

    if (!hearingDevice) {

      DVLOG(2) << "Skipping unknown device, conn_id=" << loghex(conn_id);

      return;

    }

    if (status == GATT_SUCCESS && tx_phys == PHY_LE_2M &&

        rx_phys == PHY_LE_2M) {

      LOG(INFO) << hearingDevice->address << " phy update to 2M successful";

      return;

    }

    LOG(INFO) << hearingDevice->address

              << " phy update to 2M fail, try again. status: " << status

              << ", tx_phys: " << tx_phys << ", rx_phys: " << rx_phys;

    BTM_BleSetPhy(hearingDevice->address, PHY_LE_2M, PHY_LE_2M, 0);

  }



  void OnServiceChangeEvent(const RawAddress& address) {

    HearingDevice* hearingDevice = hearingDevices.FindByAddress(address);

    if (!hearingDevice) {
@@ -875,6 +890,15 @@ class HearingAidImpl : public HearingAid { 
  void ConnectSocket(HearingDevice* hearingDevice, uint16_t psm) {

    tL2CAP_CFG_INFO cfg_info = tL2CAP_CFG_INFO{.mtu = 512};



    if (controller_get_interface()->supports_ble_2m_phy()) {

      LOG(INFO) << hearingDevice->address << " set preferred PHY to 2M";

      BTM_BleSetPhy(hearingDevice->address, PHY_LE_2M, PHY_LE_2M, 0);

    }



    // Set data length

    // TODO(jpawlowski: for 16khz only 87 is required, optimize

    BTM_SetBleDataLength(hearingDevice->address, 167);



    SendEnableServiceChangedInd(hearingDevice);



    uint8_t service_id = hearingDevice->isLeft()
@@ -915,8 +939,8 @@ class HearingAidImpl : public HearingAid { 
      instance->OnPsmRead(conn_id, status, handle, len, value, data);

  }



  /* CoC Socket is ready */

  void OnGapConnection(const RawAddress& address) {

  /* CoC Socket, BLE connection parameter are ready */

  void OnDeviceReady(const RawAddress& address) {

    HearingDevice* hearingDevice = hearingDevices.FindByAddress(address);

    if (!hearingDevice) {

      LOG(INFO) << "Device not connected to profile" << address;
@@ -1398,7 +1422,16 @@ class HearingAidImpl : public HearingAid { 


        LOG(INFO) << "GAP_EVT_CONN_OPENED " << address << ", tx_mtu=" << tx_mtu

                  << ", init_credit=" << init_credit;

        OnGapConnection(address);



        HearingDevice* hearingDevice = hearingDevices.FindByAddress(address);

        if (!hearingDevice) {

          LOG(INFO) << "Skipping unknown device" << address;

          return;

        }

        hearingDevice->gap_opened = true;

        if (hearingDevice->connection_update_status == COMPLETED) {

          OnDeviceReady(address);

        }

        break;

      }
@@ -1417,6 +1450,7 @@ class HearingAidImpl : public HearingAid { 
          hearingDevice->accepting_audio = false;

          hearingDevice->playback_started = false;

          hearingDevice->command_acked = false;

          hearingDevice->gap_opened = false;

        }

        break;

      case GAP_EVT_CONN_DATA_AVAIL: {
@@ -1631,6 +1665,7 @@ class HearingAidImpl : public HearingAid { 
      }

    }

    hearingDevice->connection_update_status = NONE;

    hearingDevice->gap_opened = false;



    if (hearingDevice->conn_id) {

      BtaGattQueue::Clean(hearingDevice->conn_id);
@@ -1850,6 +1885,12 @@ void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      if (!instance) return;

      instance->OnServiceDiscDoneEvent(p_data->service_changed.remote_bda);

      break;

    case BTA_GATTC_PHY_UPDATE_EVT: {

      if (!instance) return;

      tBTA_GATTC_PHY_UPDATE& p = p_data->phy_update;

      instance->OnPhyUpdateEvent(p.conn_id, p.tx_phy, p.rx_phy, p.status);

      break;

    }



    default:

      break;

system/bta/include/bta_hearing_aid_api.h

+6 −2
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ struct HearingDevice { 
  int read_rssi_count;

  int num_intervals_since_last_rssi_read;



  bool gap_opened;



  HearingDevice(const RawAddress& address, uint8_t capabilities,

                uint16_t codecs, uint16_t audio_control_point_handle,

                uint16_t audio_status_handle, uint16_t audio_status_ccc_handle,
@@ -185,7 +187,8 @@ struct HearingDevice { 
        codecs(codecs),

        playback_started(false),

        command_acked(false),

        read_rssi_count(0) {}

        read_rssi_count(0),

        gap_opened(false) {}



  HearingDevice(const RawAddress& address, bool first_connection)

      : address(address),
@@ -207,7 +210,8 @@ struct HearingDevice { 
        codecs(0),

        playback_started(false),

        command_acked(false),

        read_rssi_count(0) {}

        read_rssi_count(0),

        gap_opened(false) {}



  HearingDevice() : HearingDevice(RawAddress::kEmpty, false) {}