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

Commit 8097cff2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11171107 from d3670c29 to 24Q1-release 

Change-Id: I1a071409d7f5f2ab741e369d640cf8a6fbb80b47
parents d895669c d3670c29

system/bta/dm/bta_dm_act.cc

+0 −6
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result); 
#define PROPERTY_PAGE_TIMEOUT "bluetooth.core.classic.page_timeout"

#endif



void bta_dm_disc_disable_search_and_disc();

void bta_dm_disc_discover_next_device();

void bta_dm_disc_gatt_refresh(const RawAddress& bd_addr);

void bta_dm_disc_gattc_register();

void bta_dm_disc_remove_device(const RawAddress& bd_addr);



namespace {



struct WaitForAllAclConnectionsToDrain {

system/btif/test/btif_rc_test.cc

+4 −2
Original line number Diff line number Diff line
@@ -223,10 +223,11 @@ struct rc_feature_cb_t { 
static std::promise<rc_connection_state_cb_t> g_btrc_connection_state_promise;

static std::promise<rc_feature_cb_t> g_btrc_feature;



class BtifRcFeatureTest : public BtifRcTest {

class BtifRcWithCallbacksTest : public BtifRcTest {

 protected:

  void SetUp() override {

    BtifRcTest::SetUp();

    btrc_ctrl_callbacks = default_btrc_ctrl_callbacks;

    init_ctrl(&btrc_ctrl_callbacks);

    jni_thread.StartUp();

    btrc_ctrl_callbacks.getrcfeatures_cb = [](const RawAddress& bd_addr,
@@ -243,11 +244,12 @@ class BtifRcFeatureTest : public BtifRcTest { 
    jni_thread.ShutDown();

    bt_rc_ctrl_callbacks->getrcfeatures_cb = [](const RawAddress& bd_addr,

                                                int features) {};

    btrc_ctrl_callbacks = default_btrc_ctrl_callbacks;

    BtifRcTest::TearDown();

  }

};



TEST_F(BtifRcFeatureTest, handle_rc_ctrl_features) {

TEST_F(BtifRcWithCallbacksTest, handle_rc_ctrl_features) {

  g_btrc_feature = std::promise<rc_feature_cb_t>();

  std::future<rc_feature_cb_t> future = g_btrc_feature.get_future();

  btif_rc_device_cb_t p_dev;

system/conf/interop_database.conf

+6 −0
Original line number Diff line number Diff line
@@ -850,3 +850,9 @@ fc:3f:a6 = Address_Based 
[INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT]

00:e0:4c = Address_Based

00:9e:c8 = Address_Based



# Certain devices have issue where they cannot handle ATT traffic during SMP key exchange.

# For those devices, queued ATT writes are delayed until after both encryption complete and

# SMP key exchange completed.

[INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING]

ORN = Name_Based

system/device/include/interop.h

+5 −0
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ typedef enum { 
  // need we initiate connection after signalling timeout

  INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT,



  // Certain devices have issue where they cannot handle ATT traffic during SMP

  // key exchange. For those devices, queued ATT writes are delayed until after

  // both encryption complete and SMP key exchange completed.

  INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING,



  END_OF_INTEROP_LIST

} interop_feature_t;

system/device/src/interop.cc

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ static const char* interop_feature_string_(const interop_feature_t feature) { 
    CASE_RETURN_STR(INTEROP_HFP_1_7_ALLOWLIST);

    CASE_RETURN_STR(INTEROP_HFP_1_9_ALLOWLIST);

    CASE_RETURN_STR(INTEROP_IGNORE_DISC_BEFORE_SIGNALLING_TIMEOUT);

    CASE_RETURN_STR(INTEROP_SUSPEND_ATT_TRAFFIC_DURING_PAIRING);

  }

  return UNKNOWN_INTEROP_FEATURE;

}