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

Commit 8b3a02b2 authored by hscham's avatar hscham
Browse files

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

`task_ = ();` will be ambiguous after libchrome uprev after r927031 (see
original upstream CL crrev.com/c/3180101).

Bug: 198993705
Tag: #floss
Test: FEATURES=test emerge-zork-floss floss

Change-Id: I49af0c89ab6668aa0e2410876c4f44baf9180588
parent 6d637a00

system/common/repeating_timer.cc

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

#include "time_util.h"



#include <base/callback.h>

#include <base/logging.h>



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

  message_loop_thread_ = nullptr;

  task_wrapper_.Cancel();

#if BASE_VER < 927031

  task_ = {};

#else

  task_ = base::NullCallback();

#endif

  period_ = base::TimeDelta();

  expected_time_next_task_us_ = 0;

  promise.set_value();