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

Commit c16e2943 authored by Chen Chen's avatar Chen Chen Committed by Automerger Merge Worker
Browse files

Merge "BluetoothMetrics: Log HFP connection failure reasons from btif_hf" am:... 

Merge "BluetoothMetrics: Log HFP connection failure reasons from btif_hf" am: 05b59f02 am: d15251b8 am: e4e57912

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2086445



Change-Id: Ie795cfaa1a16e1c5f325b9b4f8560e9b2d9c8300
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc092335 e4e57912

system/btif/src/btif_hf.cc

+17 −2
Original line number Original line Diff line number Diff line
@@ -27,12 +27,16 @@ 




#define LOG_TAG "bt_btif_hf"

#define LOG_TAG "bt_btif_hf"





#include <base/logging.h>

#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>



#include <cstdint>

#include <cstdint>

#include <string>

#include <string>





#include "bta/include/bta_ag_api.h"

#include "bta/include/bta_ag_api.h"

#include "bta/include/utl.h"

#include "bta/include/utl.h"

#include "btif/include/btif_common.h"

#include "btif/include/btif_common.h"

#include "btif/include/btif_metrics_logging.h"

#include "btif/include/btif_profile_queue.h"

#include "btif/include/btif_profile_queue.h"

#include "btif/include/btif_util.h"

#include "btif/include/btif_util.h"

#include "common/metrics.h"

#include "common/metrics.h"
@@ -44,8 +48,6 @@ 
#include "stack/include/btm_api.h"

#include "stack/include/btm_api.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





#include <base/logging.h>



namespace {

namespace {

constexpr char kBtmLogTag[] = "HFP";

constexpr char kBtmLogTag[] = "HFP";

}

}
@@ -339,6 +341,10 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { 
                         << ", report disconnect state for p_data bda.";

                         << ", report disconnect state for p_data bda.";

            bt_hf_callbacks->ConnectionStateCallback(

            bt_hf_callbacks->ConnectionStateCallback(

                BTHF_CONNECTION_STATE_DISCONNECTED, &(p_data->open.bd_addr));

                BTHF_CONNECTION_STATE_DISCONNECTED, &(p_data->open.bd_addr));

            log_counter_metrics_btif(

                android::bluetooth::CodePathCounterKeyEnum::

                    HFP_COLLISON_AT_AG_OPEN,

                1);

          }

          }

          break;

          break;

        }

        }
@@ -358,6 +364,9 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { 
          bt_hf_callbacks->ConnectionStateCallback(

          bt_hf_callbacks->ConnectionStateCallback(

              BTHF_CONNECTION_STATE_DISCONNECTED,

              BTHF_CONNECTION_STATE_DISCONNECTED,

              &(btif_hf_cb[idx].connected_bda));

              &(btif_hf_cb[idx].connected_bda));

          log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::

                                       HFP_COLLISON_AT_CONNECTING,

                                   1);

          reset_control_block(&btif_hf_cb[idx]);

          reset_control_block(&btif_hf_cb[idx]);

          btif_queue_advance();

          btif_queue_advance();

        }

        }
@@ -387,6 +396,9 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { 
        reset_control_block(&btif_hf_cb[idx]);

        reset_control_block(&btif_hf_cb[idx]);

        bt_hf_callbacks->ConnectionStateCallback(btif_hf_cb[idx].state,

        bt_hf_callbacks->ConnectionStateCallback(btif_hf_cb[idx].state,

                                                 &connected_bda);

                                                 &connected_bda);

        log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::

                                     HFP_SELF_INITIATED_AG_FAILED,

                                 1);

        btif_queue_advance();

        btif_queue_advance();

      }

      }

      break;

      break;
@@ -406,6 +418,9 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { 
                                               &connected_bda);

                                               &connected_bda);

      if (failed_to_setup_slc) {

      if (failed_to_setup_slc) {

        LOG(ERROR) << __func__ << ": failed to setup SLC for " << connected_bda;

        LOG(ERROR) << __func__ << ": failed to setup SLC for " << connected_bda;

        log_counter_metrics_btif(

            android::bluetooth::CodePathCounterKeyEnum::HFP_SLC_SETUP_FAILED,

            1);

        btif_queue_advance();

        btif_queue_advance();

      }

      }

      break;

      break;