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

Commit d34e01cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "floss: initialize RepeatingTimer::task_ with base::NullCallback"

parents fa973a92 8b3a02b2

system/common/repeating_timer.cc

+5 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "message_loop_thread.h"

#include "message_loop_thread.h"

#include "time_util.h"

#include "time_util.h"





#include <base/callback.h>

#include <base/logging.h>

#include <base/logging.h>





namespace bluetooth {

namespace bluetooth {
@@ -110,7 +111,11 @@ void RepeatingTimer::CancelHelper(std::promise<void> promise) { 
void RepeatingTimer::CancelClosure(std::promise<void> promise) {

void RepeatingTimer::CancelClosure(std::promise<void> promise) {

  message_loop_thread_ = nullptr;

  message_loop_thread_ = nullptr;

  task_wrapper_.Cancel();

  task_wrapper_.Cancel();

#if BASE_VER < 927031

  task_ = {};

  task_ = {};

#else

  task_ = base::NullCallback();

#endif

  period_ = base::TimeDelta();

  period_ = base::TimeDelta();

  expected_time_next_task_us_ = 0;

  expected_time_next_task_us_ = 0;

  promise.set_value();

  promise.set_value();