diff options
| author | 2022-06-29 17:23:05 +0000 | |
|---|---|---|
| committer | 2022-06-29 17:23:05 +0000 | |
| commit | 552bdbb3f7e423c4047ed209917a12f8cadf86e9 (patch) | |
| tree | db84b827307260c3e1e05d5d30a08c08d427e158 /services/inputflinger/InputReaderBase.cpp | |
| parent | ae30141ed1e6ac0f9a41a14012a9f072034b3f70 (diff) | |
| parent | ad3a19985dcb7cd8bc76ce203b26b28765112bf4 (diff) | |
Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: Id23fa2f0004319f4ee592e19dc34a6b74cdb644f
Change-Id: I146284f445cfeff49cab8b93e5a6a97b4a0e0eaa
Diffstat (limited to 'services/inputflinger/InputReaderBase.cpp')
| -rw-r--r-- | services/inputflinger/InputReaderBase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/inputflinger/InputReaderBase.cpp b/services/inputflinger/InputReaderBase.cpp index 05ef489133..a864cf8202 100644 --- a/services/inputflinger/InputReaderBase.cpp +++ b/services/inputflinger/InputReaderBase.cpp @@ -19,12 +19,12 @@ //#define LOG_NDEBUG 0 #include "InputReaderBase.h" -#include <ftl/NamedEnum.h> #include "input/DisplayViewport.h" #include "input/Input.h" -#include <android/log.h> #include <android-base/stringprintf.h> +#include <android/log.h> +#include <ftl/enum.h> #define INDENT " " #define INDENT2 " " @@ -117,7 +117,7 @@ std::optional<DisplayViewport> InputReaderConfiguration::getDisplayViewportByTyp } if (count > 1) { ALOGW("Found %zu viewports with type %s, but expected 1 at most", count, - NamedEnum::string(type).c_str()); + ftl::enum_string(type).c_str()); } return result; } |