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

Commit 4cd6d89a authored by Chris Manton's avatar Chris Manton
Browse files

[10/24] Canonical form tBTM_STATUS::BTM_ERR_KEY_MISSING 

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: If5c8812bbee9ebe0a954d0bfea401a626a30e5b4
parent 98caa708

system/bta/csis/csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -1916,7 +1916,7 @@ private: 


    log::info("Encryption required for {}. Request result: 0x{:02x}", device->addr, result);



    if (result == BTM_ERR_KEY_MISSING) {

    if (result == tBTM_STATUS::BTM_ERR_KEY_MISSING) {

      log::error("Link key unknown for {}, disconnect profile", device->addr);

      BTA_GATTC_Close(device->conn_id);

    }

system/bta/csis/csis_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ TEST_F(CsisClientTest, test_disconnect_when_link_key_is_gone) { 


  ON_CALL(btm_interface, BTM_IsEncrypted(test_address, _)).WillByDefault(DoAll(Return(false)));

  ON_CALL(btm_interface, SetEncryption(test_address, _, _, _, _))

          .WillByDefault(Return(BTM_ERR_KEY_MISSING));

          .WillByDefault(Return(tBTM_STATUS::BTM_ERR_KEY_MISSING));



  EXPECT_CALL(gatt_interface, Close(1));

system/bta/has/has_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -1875,7 +1875,7 @@ private: 


    log::info("Encryption required for {}. Request result: 0x{:02x}", device->addr, result);



    if (result == BTM_ERR_KEY_MISSING) {

    if (result == tBTM_STATUS::BTM_ERR_KEY_MISSING) {

      log::error("Link key unknown for {}, disconnect profile", device->addr);

      BTA_GATTC_Close(device->conn_id);

    }

system/bta/has/has_client_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ TEST_F(HasClientTest, test_disconnect_when_link_key_is_gone) { 


  ON_CALL(btm_interface, BTM_IsEncrypted(test_address, _)).WillByDefault(DoAll(Return(false)));

  ON_CALL(btm_interface, SetEncryption(test_address, _, _, _, _))

          .WillByDefault(Return(BTM_ERR_KEY_MISSING));

          .WillByDefault(Return(tBTM_STATUS::BTM_ERR_KEY_MISSING));



  auto test_conn_id = GetTestConnId(test_address);

  EXPECT_CALL(gatt_interface, Close(test_conn_id)).Times(1);

system/bta/hh/bta_hh_le.cc

+1 −1
Original line number Diff line number Diff line
@@ -1011,7 +1011,7 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) 
      log::verbose("Starting service discovery");

      bta_hh_le_pri_service_discovery(p_cb);

    }

  } else if (p_cb->btm_status == BTM_ERR_KEY_MISSING) {

  } else if (p_cb->btm_status == tBTM_STATUS::BTM_ERR_KEY_MISSING) {

    log::error("Received encryption failed status:{} btm_status:{}",

               bta_hh_status_text(p_cb->status), btm_status_text(p_cb->btm_status));

    bta_hh_le_api_disc_act(p_cb);