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

Commit 0801e298 authored by Paul Wang's avatar Paul Wang Committed by Automerger Merge Worker
Browse files

Merge "Mask phone number log to avoid personal information leakage in logs"... 

Merge "Mask phone number log to avoid personal information leakage in logs" into main am: a237e727 am: 6451afb8

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



Change-Id: I9d2ca90e74b67d1a1c600788403dc923b7a827d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f352143e 6451afb8

system/bta/hf_client/bta_hf_client_at.cc

+10 −5
Original line number Diff line number Diff line
@@ -552,14 +552,16 @@ static void bta_hf_client_handle_bvra(tBTA_HF_CLIENT_CB* client_cb, 


static void bta_hf_client_handle_clip(tBTA_HF_CLIENT_CB* client_cb,

                                      char* numstr, uint32_t type) {

  LOG_VERBOSE("%s: %u %s", __func__, type, numstr);

  std::string cell_number(numstr);

  LOG_VERBOSE("%s: %u %s", __func__, type, PRIVATE_CELL(cell_number));



  bta_hf_client_clip(client_cb, numstr);

}



static void bta_hf_client_handle_ccwa(tBTA_HF_CLIENT_CB* client_cb,

                                      char* numstr, uint32_t type) {

  LOG_VERBOSE("%s: %u %s", __func__, type, numstr);

  std::string cell_number(numstr);

  LOG_VERBOSE("%s: %u %s", __func__, type, PRIVATE_CELL(cell_number));



  bta_hf_client_ccwa(client_cb, numstr);

}
@@ -573,7 +575,8 @@ static void bta_hf_client_handle_cops(tBTA_HF_CLIENT_CB* client_cb, char* opstr, 


static void bta_hf_client_handle_binp(tBTA_HF_CLIENT_CB* client_cb,

                                      char* numstr) {

  LOG_VERBOSE("%s: %s", __func__, numstr);

  std::string cell_number(numstr);

  LOG_VERBOSE("%s: %s", __func__, PRIVATE_CELL(cell_number));



  bta_hf_client_binp(client_cb, numstr);

}
@@ -587,7 +590,8 @@ static void bta_hf_client_handle_clcc(tBTA_HF_CLIENT_CB* client_cb, 
              dir, status, mode, mpty);



  if (numstr) {

    LOG_VERBOSE("%s: number: %s  type: %u", __func__, numstr, type);

    std::string cell_number(numstr);

    LOG_VERBOSE("%s: number: %s  type: %u", __func__, PRIVATE_CELL(cell_number), type);

  }



  bta_hf_client_clcc(client_cb, idx, dir, status, mpty, numstr);
@@ -596,7 +600,8 @@ static void bta_hf_client_handle_clcc(tBTA_HF_CLIENT_CB* client_cb, 
static void bta_hf_client_handle_cnum(tBTA_HF_CLIENT_CB* client_cb,

                                      char* numstr, uint16_t type,

                                      uint16_t service) {

  LOG_VERBOSE("%s: number: %s type: %u service: %u", __func__, numstr, type,

  std::string cell_number(numstr);

  LOG_VERBOSE("%s: number: %s type: %u service: %u", __func__, PRIVATE_CELL(cell_number), type,

              service);



  /* TODO: should number be modified according to type? */