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

Commit 6c0477bf authored by Jack He's avatar Jack He Committed by android-build-team Robot
Browse files

DO NOT MERGE Log encryption key size 

MERGE CONFLCIT RESOLUTION TO PI-QPR3-RELEASE
* Log result from HCI_READ_ENCR_KEY_SIZE command

Bug: 124301137
Test: test drive with statsd
Change-Id: I776a3c357fcd75623fba241f150d1afb58aa23fb
(cherry picked from commit 81d1e248aca4cf0b7348909e450e083bd2a8f815)
parent b7a2939f

system/btif/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ cc_test { 
        "libprotobuf-cpp-lite",

        "libcutils",

        "libutils",

        "libstatslog",

    ],

    static_libs: [

        "libbt-bta",

system/main/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ cc_library_shared { 
        "libutils",

        "libtinyxml2",

        "libz",

        "libstatslog",

    ],

    static_libs: [

        "libbt-sbc-decoder",

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ cc_library_static { 
    shared_libs: [

        "libcutils",

        "liblog",

        "libstatslog",

    ],

    required: [

        "libldacBT_enc",

system/stack/btu/btu_hcif.cc

+17 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <base/logging.h>

#include <base/threading/thread.h>

#include <log/log.h>

#include <statslog.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>
@@ -724,6 +725,14 @@ constexpr uint8_t MIN_KEY_SIZE = 7; 


static void read_encryption_key_size_complete_after_encryption_change(

    uint8_t status, uint16_t handle, uint8_t key_size) {

  int ret = android::util::stats_write(

      android::util::BLUETOOTH_CLASSIC_PAIRING_EVENT_REPORTED, "", handle,

      HCI_READ_ENCR_KEY_SIZE, HCI_COMMAND_COMPLETE_EVT, status, 0, key_size);

  if (ret < 0) {

    LOG(WARNING) << __func__ << ": failed to log encryption key size "

                 << std::to_string(key_size);

  }



  if (status != HCI_SUCCESS) {

    LOG(INFO) << __func__ << ": disconnecting, status: " << loghex(status);

    btsnd_hcic_disconnect(handle, HCI_ERR_PEER_USER);
@@ -1677,6 +1686,14 @@ static void btu_hcif_enhanced_flush_complete_evt(void) { 


static void read_encryption_key_size_complete_after_key_refresh(

    uint8_t status, uint16_t handle, uint8_t key_size) {

  int ret = android::util::stats_write(

      android::util::BLUETOOTH_CLASSIC_PAIRING_EVENT_REPORTED, "", handle,

      HCI_READ_ENCR_KEY_SIZE, HCI_COMMAND_COMPLETE_EVT, status, 0, key_size);

  if (ret < 0) {

    LOG(WARNING) << __func__ << ": failed to log encryption key size "

                 << std::to_string(key_size);

  }



  if (status != HCI_SUCCESS) {

    LOG(INFO) << __func__ << ": disconnecting, status: " << loghex(status);

    btsnd_hcic_disconnect(handle, HCI_ERR_PEER_USER);