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

Commit cdcb089c authored by Henri Chataing's avatar Henri Chataing
Browse files

Revert the flag continue_service_discovery_when_cancel_device_discovery 

The original change Ib7eaffe87300ccd550f5016c3e2141b0c09ccdcd
modified the default (i.e. flag off) behavior of the code.

This is causing a bug where service discovery cannot be
cancelled during a new connection, leading to A2DP not being
discovered and connected.

Bug: 329642681
Test: m com.android.btservices
Change-Id: I1f3feb9c4c97615b93c2570b233ffa467562c9c3
parent c6a468a6

system/bta/dm/bta_dm_disc_legacy.cc

+1 −4
Original line number Diff line number Diff line
@@ -2219,10 +2219,7 @@ static void bta_dm_search_sm_execute(tBTA_DM_EVT event, 
          break;

        case BTA_DM_API_SEARCH_CANCEL_EVT:

          bta_dm_search_clear_queue();

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

                  continue_service_discovery_when_cancel_device_discovery()) {

          bta_dm_search_set_state(BTA_DM_SEARCH_CANCELLING);

          }

          bta_dm_search_cancel_notify();

          break;

        case BTA_DM_DISC_CLOSE_TOUT_EVT: