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

Commit e60eab8d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[RootCanal] Clear links in rust LMP on timeout" am: d2539304 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2215992



Change-Id: Iaabb782195990f39b16018a7a0fe1bbbd1ee0a4c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 073bddb6 d2539304

tools/rootcanal/model/controller/link_layer_controller.cc

+5 −3
Original line number Diff line number Diff line
@@ -2426,9 +2426,12 @@ AsyncTaskId LinkLayerController::ScheduleTask(milliseconds delay_ms, 
                                              const TaskCallback& callback) {

  if (schedule_task_) {

    return schedule_task_(delay_ms, callback);

  } else {

  } else if (delay_ms == milliseconds::zero()) {

    callback();

    return 0;

  } else {

    LOG_ERROR("Unable to schedule task on delay");

    return 0;

  }

}
@@ -4214,8 +4217,7 @@ void LinkLayerController::CheckExpiringConnection(uint16_t handle) { 
  }



  if (connections_.HasLinkExpired(handle)) {

    connections_.Disconnect(handle);

    SendDisconnectionCompleteEvent(handle, ErrorCode::CONNECTION_TIMEOUT);

    Disconnect(handle, ErrorCode::CONNECTION_TIMEOUT);

    return;

  }