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

Commit b0ceadb8 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge "Fix bta_dm_disc stuck in cancelling state" into main

parents 654ff67d cad3b091

system/bta/dm/bta_dm_disc.cc

+8 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <cstdint>

#include <cstdint>

#include <vector>

#include <vector>





#include "android_bluetooth_flags.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_disc_int.h"

#include "bta/dm/bta_dm_disc_int.h"

#include "bta/include/bta_gatt_api.h"

#include "bta/include/bta_gatt_api.h"
@@ -1965,6 +1966,13 @@ static void bta_dm_gatt_disc_complete(uint16_t conn_id, tGATT_STATUS status) { 
            bta_dm_clear_conn_id_on_client_close_is_enabled()) {

            bta_dm_clear_conn_id_on_client_close_is_enabled()) {

      bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;

      bta_dm_search_cb.conn_id = GATT_INVALID_CONN_ID;

    }

    }



    if (IS_FLAG_ENABLED(bta_dm_disc_stuck_in_cancelling_fix)) {

      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();

    }

  }

  }

}

}