| commit | 47866840e80d87de6f13b3423324c46ede982f41 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Mon Oct 02 22:09:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 02 22:09:45 2023 +0000 |
| tree | eba3e6a7be845fd108cca84340458a05d5d2acf5 | |
| parent | 87300af139d1918573faff62144252b5f568135b [diff] | |
| parent | 0c50c02353db9cf8f54edc456958e70dd433982f [diff] |
Merge "inputflinger: add missing <functional> include" into main am: 3508150e04 am: 041b86fec7 am: 0c50c02353 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2758333 Change-Id: Ia1d7f6c7803c0f24fe0b060ce2f10ae2a3018b23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/inputflinger/BlockingQueue.h b/services/inputflinger/BlockingQueue.h index fe37287..c435bd2 100644 --- a/services/inputflinger/BlockingQueue.h +++ b/services/inputflinger/BlockingQueue.h
@@ -16,10 +16,11 @@ #pragma once -#include "android-base/thread_annotations.h" #include <condition_variable> +#include <functional> #include <mutex> #include <vector> +#include "android-base/thread_annotations.h" namespace android {