commit 0c08180526d356d5de4f1c11c410d6debedb81b7
author Xin Li <delphij@google.com> Sat Dec 10 00:25:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Dec 10 00:25:04 2022 +0000
tree fbe569fd274538b06b34aded8e3cb6f92307b17c
parent 21f7627f2359a615e3cd073a08dedb26bbb4d8e1
parent e12b15ca9f16eba43232df116d40cdb369e77107

[automerger skipped] Merge Android 13 QPR1 am: 383fc759bf -s ours am: e12b15ca9f -s ours

am skip reason: Merged-In I06f680220671171481f850735f6093799466eea4 with SHA-1 3d38e198cf is already in history

Original change: https://android-review.googlesource.com/c/platform/system/connectivity/wificond/+/2338416

Change-Id: Id23e457753b7b16ce28a264aed908d90814ef92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

looper_backed_event_loop.cpp

diff --git a/looper_backed_event_loop.cpp b/looper_backed_event_loop.cpp
index f759948..e97d1d9 100644
--- a/looper_backed_event_loop.cpp
+++ b/looper_backed_event_loop.cpp
@@ -30,7 +30,7 @@
 
   ~EventLoopCallback() override = default;
 
-  virtual void handleMessage(const android::Message& message) {
+  void handleMessage(const android::Message& message) override {
     callback_();
   }
 
@@ -77,16 +77,13 @@
 }
 
 void LooperBackedEventLoop::PostTask(const std::function<void()>& callback) {
-  sp<android::MessageHandler> event_loop_callback =
-      new EventLoopCallback(callback);
-  looper_->sendMessage(event_loop_callback, Message());
+  looper_->sendMessage(sp<EventLoopCallback>::make(callback), Message());
 }
 
 void LooperBackedEventLoop::PostDelayedTask(
     const std::function<void()>& callback,
     int64_t delay_ms) {
-  sp<android::MessageHandler> looper_callback = new EventLoopCallback(callback);
-  looper_->sendMessageDelayed(ms2ns(delay_ms), looper_callback, Message());
+  looper_->sendMessageDelayed(ms2ns(delay_ms), sp<EventLoopCallback>::make(callback), Message());
 }
 
 bool LooperBackedEventLoop::WatchFileDescriptor(