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

Commit b79faf02 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iaf69c630,Iff962ede into main am: 5c903eac 

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



Change-Id: I0ce616c3a21bc0a4d3112cb5f6e4a6841b1ee25f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb8252f6 5c903eac

system/bta/ag/bta_ag_cmd.cc

+2 −0
Original line number Diff line number Diff line
@@ -1668,6 +1668,8 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, const tBTA_AG_API_RESULT& resu 
      break;



    case BTA_AG_CALL_CANCEL_RES:

      alarm_cancel(p_scb->ring_timer);



      /* send indicators */

      bta_ag_send_call_inds(p_scb, result.result);

      break;

system/btif/src/btif_uid.cc

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static uid_set_node_t* uid_set_find_or_create_node(uid_set_t* set, int32_t app_u 
}



void uid_set_add_tx(uid_set_t* set, int32_t app_uid, uint64_t bytes) {

  if (app_uid == -1 || bytes == 0) {

  if (set == nullptr || app_uid == -1 || bytes == 0) {

    return;

  }
@@ -83,7 +83,7 @@ void uid_set_add_tx(uid_set_t* set, int32_t app_uid, uint64_t bytes) { 
}



void uid_set_add_rx(uid_set_t* set, int32_t app_uid, uint64_t bytes) {

  if (app_uid == -1 || bytes == 0) {

  if (set == nullptr || app_uid == -1 || bytes == 0) {

    return;

  }