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

Commit da15a2c1 authored by Georg Neis's avatar Georg Neis Committed by Automerger Merge Worker
Browse files

Merge "Migrate to task posting API v3" am: e40fa791 

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



Change-Id: I48a4b5f3ce5ce39aa89f7baf47d7cb84139377f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 773bb1cd e40fa791

system/include/abstract_message_loop.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -28,9 +28,9 @@ 
#endif

#endif

#include <base/message_loop/message_pump.h>

#include <base/message_loop/message_pump.h>

#include <base/task/single_thread_task_executor.h>

#include <base/task/single_thread_task_executor.h>

#include <base/task/single_thread_task_runner.h>

#include <base/test/task_environment.h>

#include <base/test/task_environment.h>

#include <base/threading/thread.h>

#include <base/threading/thread.h>

#include <base/threading/thread_task_runner_handle.h>

#else

#else

#include <base/message_loop/message_loop.h>

#include <base/message_loop/message_loop.h>

#include <base/threading/thread.h>

#include <base/threading/thread.h>
@@ -43,14 +43,14 @@ namespace btbase { 
class AbstractMessageLoop : public base::SingleThreadTaskExecutor {

class AbstractMessageLoop : public base::SingleThreadTaskExecutor {

 public:

 public:

  static scoped_refptr<base::SingleThreadTaskRunner> current_task_runner() {

  static scoped_refptr<base::SingleThreadTaskRunner> current_task_runner() {

    return base::ThreadTaskRunnerHandle::Get();

    return base::SingleThreadTaskRunner::GetCurrentDefault();

  }

  }

};

};





class AbstractTestMessageLoop : public base::test::TaskEnvironment {

class AbstractTestMessageLoop : public base::test::TaskEnvironment {

 public:

 public:

  static scoped_refptr<base::SingleThreadTaskRunner> current_task_runner() {

  static scoped_refptr<base::SingleThreadTaskRunner> current_task_runner() {

    return base::ThreadTaskRunnerHandle::Get();

    return base::SingleThreadTaskRunner::GetCurrentDefault();

  }

  }

};

};