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

Commit 485ce9cc authored by Himanshu Rawat's avatar Himanshu Rawat
Browse files

Removing flag bta_dm_disc_stuck_in_cancelling_fix 

Test: mmm packages/modules/Bluetooth
Flag: com.android.bluetooth.flags.bta_dm_disc_stuck_in_cancelling_fix
Bug: 319890673
Change-Id: I9591c30012aa1e8c8933c59f9f654c9e08ae20c6
parent 08fe23f8

flags/bta_dm.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ flag { 
    bug: "311196228"

}



flag {

    name: "bta_dm_disc_stuck_in_cancelling_fix"

    namespace: "bluetooth"

    description: "Fix being stuck in BTA_DM_SEARCH_CANCELLING"

    bug: "319890673"

}



flag {

    name: "bta_dm_defer_device_discovery_state_change_until_rnr_complete"

    namespace: "bluetooth"

system/bta/dm/bta_dm_disc.cc

+3 −6
Original line number Diff line number Diff line
@@ -617,14 +617,11 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) { 
  } else {

    bta_dm_discovery_cb.conn_id = GATT_INVALID_CONN_ID;



    if (com::android::bluetooth::flags::bta_dm_disc_stuck_in_cancelling_fix()) {

      log::info(

          "Discovery complete for invalid conn ID. Will pick up next job");

    log::info("Discovery complete for invalid conn ID. Will pick up next job");

    bta_dm_discovery_set_state(BTA_DM_DISCOVER_IDLE);

    bta_dm_execute_queued_discovery_request();

  }

}

}



/*******************************************************************************

 *

system/bta/dm/bta_dm_disc_legacy.cc

+4 −7
Original line number Diff line number Diff line
@@ -1836,15 +1836,12 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) { 
  } else {

    bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;



    if (com::android::bluetooth::flags::bta_dm_disc_stuck_in_cancelling_fix()) {

      log::info(

          "Discovery complete for invalid conn ID. Will pick up next job");

    log::info("Discovery complete for invalid conn ID. Will pick up next job");

    bta_dm_search_set_state(BTA_DM_SEARCH_IDLE);

    bta_dm_free_sdp_db();

    bta_dm_execute_queued_request();

  }

}

}



/*******************************************************************************

 *