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

Commit 58283acd authored by Rahul Arya's avatar Rahul Arya
Browse files

[Invisalign] Fix crash in instrumentation tests 

NPE if we clean_up_stack before it is stopped.

Test: atest BluetoothInstrumentationTests
Bug: 254063018
Change-Id: Ife9ce03364ff3cad637b9dc566d83f40e7ab5cbf
parent 5457ff2c

system/btif/include/stack_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ typedef struct { 
  void (*start_up_stack_async)(bluetooth::core::CoreInterface*,

                               ProfileStartCallback, ProfileStopCallback);

  void (*shut_down_stack_async)(ProfileStopCallback);

  void (*clean_up_stack)(void);

  void (*clean_up_stack)(ProfileStopCallback);



  bool (*get_stack_is_running)(void);

} stack_manager_t;

system/btif/src/bluetooth.cc

+3 −1
Original line number Diff line number Diff line
@@ -458,7 +458,9 @@ static int disable(void) { 
  return BT_STATUS_SUCCESS;

}



static void cleanup(void) { stack_manager_get_interface()->clean_up_stack(); }

static void cleanup(void) {

  stack_manager_get_interface()->clean_up_stack(&stop_profiles);

}



bool is_restricted_mode() { return restricted_mode; }

system/btif/src/stack_manager.cc

+10 −7
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ static void event_start_up_stack(bluetooth::core::CoreInterface* interface, 
                                 ProfileStartCallback startProfiles,

                                 ProfileStopCallback stopProfiles);

static void event_shut_down_stack(ProfileStopCallback stopProfiles);

static void event_clean_up_stack(std::promise<void> promise);

static void event_clean_up_stack(std::promise<void> promise,

                                 ProfileStopCallback stopProfiles);



static void event_signal_stack_up(void* context);

static void event_signal_stack_down(void* context);
@@ -185,13 +186,14 @@ static void shut_down_stack_async(ProfileStopCallback stopProfiles) { 
                               base::Bind(event_shut_down_stack, stopProfiles));

}



static void clean_up_stack() {

static void clean_up_stack(ProfileStopCallback stopProfiles) {

  // This is a synchronous process. Post it to the thread though, so

  // state modification only happens there.

  std::promise<void> promise;

  auto future = promise.get_future();

  management_thread.DoInThread(

      FROM_HERE, base::BindOnce(event_clean_up_stack, std::move(promise)));

      FROM_HERE,

      base::BindOnce(event_clean_up_stack, std::move(promise), stopProfiles));



  auto status =

      future.wait_for(std::chrono::milliseconds(BT_STACK_CLEANUP_WAIT_MS));
@@ -403,22 +405,23 @@ static void event_shut_down_stack(ProfileStopCallback stopProfiles) { 
  LOG_INFO("%s finished", __func__);

}



static void ensure_stack_is_not_running() {

static void ensure_stack_is_not_running(ProfileStopCallback stopProfiles) {

  if (stack_is_running) {

    LOG_WARN("%s found the stack was still running. Bringing it down now.",

             __func__);

    event_shut_down_stack(nullptr);

    event_shut_down_stack(stopProfiles);

  }

}



// Synchronous function to clean up the stack

static void event_clean_up_stack(std::promise<void> promise) {

static void event_clean_up_stack(std::promise<void> promise,

                                 ProfileStopCallback stopProfiles) {

  if (!stack_is_initialized) {

    LOG_INFO("%s found the stack already in a clean state", __func__);

    goto cleanup;

  }



  ensure_stack_is_not_running();

  ensure_stack_is_not_running(stopProfiles);



  LOG_INFO("%s is cleaning up the stack", __func__);

  stack_is_initialized = false;

system/test/headless/connect/connect.cc

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ int do_connect(unsigned int num_loops, const RawAddress& bd_addr, 


  fprintf(stdout, "Just crushing stack\n");

  LOG(INFO) << "Just crushing stack";

  stack_manager_get_interface()->clean_up_stack();

  bluetoothInterface.disable();



  if (disconnect_wait_time == 0) {

    fprintf(stdout, "Waiting to disconnect from supervision timeout\n");