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

Commit a194e0b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "b/226693442" 

* changes:
  Revert "Disable sniff mode for Phonak device"
  Do not perform SSR when avdtp start
parents fb0d6fe1 eba5853c

system/bta/dm/bta_dm_pm.cc

+6 −1
Original line number Diff line number Diff line
@@ -449,7 +449,12 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, 
  }



  if (p_bta_dm_ssr_spec[index].max_lat || index == BTA_DM_PM_SSR_HH) {

    /* do not perform ssr for AVDTP start */

    if (id != BTA_ID_AV || status != BTA_SYS_CONN_BUSY) {

      bta_dm_pm_ssr(peer_addr, index);

    } else {

      LOG_DEBUG("%s: Do not perform SSR when AVDTP start", __func__);

    }

  } else {

    const controller_t* controller = controller_get_interface();

    uint8_t* p = NULL;

system/device/include/interop_database.h

+0 −3
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ static const interop_addr_entry_t interop_addr_database[] = { 
    // KDDI Carkit

    {{{0x44, 0xea, 0xd8, 0, 0, 0}}, 3, INTEROP_DISABLE_SNIFF},



    // Phonak

    {{{0x70, 0x66, 0x1b, 0, 0, 0}}, 3, INTEROP_DISABLE_SNIFF},



    // Toyota Camry 2018 Carkit HFP AT+BIND missing

    {{{0x94, 0xb2, 0xcc, 0x30, 0, 0}}, 4, INTEROP_SLC_SKIP_BIND_COMMAND},

};