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

Commit a37e5d50 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Revert "DO NOT MERGE Log encryption key size" 

This reverts commit 5e0a20e7.

Reason for revert: Breaks aosp_*-userdebug targets

Bug: 129387219
Change-Id: I90934b68a1ddabb5666820fbae87aeb647a5c36c
parent 5e0a20e7

system/btif/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ cc_test { 
        "libkeystore_binder",

        "libkeystore_parcelables",

        "libbinder",

        "libstatslog",

    ],

    static_libs: [

        "libbt-bta",

system/main/Android.bp

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

        "libkeystore_binder",

        "libkeystore_parcelables",

        "libstatslog",

    ],

    static_libs: [

        "libbt-sbc-decoder",

system/stack/Android.bp

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

        "libcutils",

        "liblog",

        "libstatslog",

    ],

    required: [

        "libldacBT_enc",

system/stack/btu/btu_hcif.cc

+0 −16
Original line number Diff line number Diff line
@@ -1121,14 +1121,6 @@ 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);
@@ -2049,14 +2041,6 @@ 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);