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

Commit 6f8a47a7 authored by Chris Manton's avatar Chris Manton
Browse files

[12/24] Canonical form tBTM_STATUS::BTM_FAILED_ON_SECURITY 

Prepare for class enum-ify tBTM_STATUS

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

Change-Id: Ibb90b945a4b4289e2b7a167ef56267f459cea575
parent 56b55ec2

system/bta/csis/csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -1848,7 +1848,7 @@ private: 
        if (BTM_IsEncrypted(p_data->enc_cmpl.remote_bda, BT_TRANSPORT_LE)) {

          encryption_status = tBTM_STATUS::BTM_SUCCESS;

        } else {

          encryption_status = BTM_FAILED_ON_SECURITY;

          encryption_status = tBTM_STATUS::BTM_FAILED_ON_SECURITY;

        }

        OnLeEncryptionComplete(p_data->enc_cmpl.remote_bda, encryption_status);

      } break;

system/bta/hh/bta_hh_le.cc

+2 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,8 @@ void bta_hh_security_cmpl(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* /* p_buf */) 
               btm_status_text(p_cb->btm_status));

    if (!(p_cb->status == BTA_HH_ERR_SEC &&

          (p_cb->btm_status == tBTM_STATUS::BTM_ERR_PROCESSING ||

           p_cb->btm_status == BTM_FAILED_ON_SECURITY || p_cb->btm_status == BTM_WRONG_MODE))) {

           p_cb->btm_status == tBTM_STATUS::BTM_FAILED_ON_SECURITY ||

           p_cb->btm_status == BTM_WRONG_MODE))) {

      bta_hh_le_api_disc_act(p_cb);

    }

  }

system/bta/le_audio/client.cc

+1 −1
Original line number Diff line number Diff line
@@ -5811,7 +5811,7 @@ void le_audio_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      if (BTM_IsEncrypted(p_data->enc_cmpl.remote_bda, BT_TRANSPORT_LE)) {

        encryption_status = tBTM_STATUS::BTM_SUCCESS;

      } else {

        encryption_status = BTM_FAILED_ON_SECURITY;

        encryption_status = tBTM_STATUS::BTM_FAILED_ON_SECURITY;

      }

      instance->OnEncryptionComplete(p_data->enc_cmpl.remote_bda, encryption_status);

    } break;

system/bta/vc/vc.cc

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ private: 
        if (BTM_IsEncrypted(p_data->enc_cmpl.remote_bda, BT_TRANSPORT_LE)) {

          encryption_status = tBTM_STATUS::BTM_SUCCESS;

        } else {

          encryption_status = BTM_FAILED_ON_SECURITY;

          encryption_status = tBTM_STATUS::BTM_FAILED_ON_SECURITY;

        }

        OnEncryptionComplete(p_data->enc_cmpl.remote_bda, encryption_status);

      } break;

system/bta/vc/vc_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -484,7 +484,8 @@ protected: 
                                            tBTM_BLE_SEC_ACT sec_act) -> tBTM_STATUS {

                      if (p_callback) {

                        p_callback(bd_addr, transport, p_ref_data,

                                   success ? tBTM_STATUS::BTM_SUCCESS : BTM_FAILED_ON_SECURITY);

                                   success ? tBTM_STATUS::BTM_SUCCESS

                                           : tBTM_STATUS::BTM_FAILED_ON_SECURITY);

                      }

                      GetEncryptionCompleteEvt(bd_addr);

                      return tBTM_STATUS::BTM_SUCCESS;