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

Commit d0c7d9c5 authored by Harshita Ojha's avatar Harshita Ojha
Browse files

Don't notify java state machine about failure when the remote device is already connected 

When there is a HFP collision, the phone accepts remote request, and fails the outgoing request
When outgoing request cancelled, native layer notifies java layer as disconnected.
This confuses the java state machine to make a reconnection.
This change target to not notify java layer for the failure.

Bug: 341209537
Bug: 346679106
Test: m packages/modules/Bluetooth with Manual testing
Flag: com.android.bluetooth.flags.ignore_notify_when_already_connected
Change-Id: Id075f20fecdcd6369f8f41bbff17b2dc6fd13efb
parent daef9fc8

system/btif/src/btif_hf.cc

+25 −2
Original line number Diff line number Diff line
@@ -428,8 +428,31 @@ static void btif_hf_upstreams_evt(uint16_t event, char* p_param) { 
                   btif_hf_cb[idx].connected_bda, p_data->open.status);

        RawAddress connected_bda = btif_hf_cb[idx].connected_bda;

        reset_control_block(&btif_hf_cb[idx]);



        if (com::android::bluetooth::flags::

                ignore_notify_when_already_connected()) {

          bool notify_required = true;



          for (int i = 0; i < BTA_AG_MAX_NUM_CLIENTS; i++) {

            if ((i != idx) &&

                (BTHF_CONNECTION_STATE_CONNECTED == btif_hf_cb[i].state) &&

                (connected_bda == btif_hf_cb[i].connected_bda)) {

              // There is already an active cnnection on this device

              // skip upper layer notification

              notify_required = false;

              break;

            }

          }



          if (notify_required) {

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

                                                     &connected_bda);

          }

        } else {

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

                                                   &connected_bda);

        }



        log_counter_metrics_btif(android::bluetooth::CodePathCounterKeyEnum::

                                     HFP_SELF_INITIATED_AG_FAILED,

                                 1);