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

Commit 2a614a86 authored by Chris Manton's avatar Chris Manton
Browse files

Flag: Remove api_get_connection_state_sync_on_main 

Bug: 325333718
Bug: 315241296
Test: m .
Change-Id: Ib8e8aaea77b27e704703b2fafe59fb04d5bbd971
parent 8aa0bf95

flags/connectivity.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -14,10 +14,3 @@ flag { 
    description: "Guard the le shim connection map with a mutex"

    bug: "302054609"

}
 


flag {

    name: "api_get_connection_state_sync_on_main"

    namespace: "bluetooth"

    description: "API call is unprotected from thread race conditions"

    bug: "325333718"

}

system/btif/src/bluetooth.cc

+1 −5
Original line number Diff line number Diff line
@@ -674,12 +674,8 @@ static int get_connection_state(const RawAddress* bd_addr) { 


  if (bd_addr == nullptr) return 0;



  if (IS_FLAG_ENABLED(api_get_connection_state_sync_on_main)) {

    return btif_dm_get_connection_state_sync(*bd_addr);

  } else {

  return btif_dm_get_connection_state(*bd_addr);

}

}



static int pin_reply(const RawAddress* bd_addr, uint8_t accept, uint8_t pin_len,

                     bt_pin_code_t* pin_code) {