| commit | 81015536bc60805e7a8154a67bdc343d1e817352 | [log] [tgz] |
|---|---|---|
| author | Ady Abraham <adyabr@google.com> | Tue Aug 02 16:27:53 2022 +0000 |
| committer | Ady Abraham <adyabr@google.com> | Tue Aug 02 17:10:19 2022 +0000 |
| tree | 21fa39929fe7c7c43670b10534c7354672caec39 | |
| parent | d11bade4e5d7b7818090d775f0bb4dea9d719206 [diff] |
SF: minor fixes Follow up on change id I347b2cf57f1df426d11d07a84075419597d4a442 Change-Id: I40e820492dcee0374b86c98b651d1415bab8be8d Test: presubmit
diff --git a/services/surfaceflinger/Scheduler/MessageQueue.h b/services/surfaceflinger/Scheduler/MessageQueue.h index d3c1e7a..9dde82b 100644 --- a/services/surfaceflinger/Scheduler/MessageQueue.h +++ b/services/surfaceflinger/Scheduler/MessageQueue.h
@@ -61,7 +61,7 @@ template <typename F> inline auto makeTask(F&& f) { - sp<Task<F>> task = sp<Task<F>>::make(std::move(f)); + sp<Task<F>> task = sp<Task<F>>::make(std::forward<F>(f)); return std::make_pair(task, task->mTask.get_future()); }
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index c99c40e..0611bbe 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -478,7 +478,7 @@ // Sever the link to inputflinger since it's gone as well. static_cast<void>(mScheduler->schedule( - [=] { mInputFlinger = sp<os::IInputFlinger>::fromExisting(nullptr); })); + [this] { mInputFlinger.clear(); })); // restore initial conditions (default device unblank, etc) initializeDisplays();