summaryrefslogtreecommitdiff
path: root/include/input/KeyLayoutMap.h
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-23 14:24:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-08-23 14:24:53 +0000
commitefe6ae66ec1e10390d53ea479fc65057a4f9f201 (patch)
tree5e6e8403299d11286b5cda61790ded1f0361e645 /include/input/KeyLayoutMap.h
parent5727405482a5f4b2177f08d5c7d2c76b1632a232 (diff)
parentef1a90de7aa6e77ce90b8015011628014ede9f2c (diff)
Merge "Refactor input code for require_kernel_config parameter" into tm-qpr-dev
Diffstat (limited to 'include/input/KeyLayoutMap.h')
-rw-r--r--include/input/KeyLayoutMap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/input/KeyLayoutMap.h b/include/input/KeyLayoutMap.h
index b2bd535cbf..d1925f4eee 100644
--- a/include/input/KeyLayoutMap.h
+++ b/include/input/KeyLayoutMap.h
@@ -21,7 +21,6 @@
#include <stdint.h>
#include <utils/Errors.h>
#include <utils/KeyedVector.h>
-#include <utils/RefBase.h>
#include <utils/Tokenizer.h>
#include <input/InputDevice.h>
@@ -66,7 +65,6 @@ struct AxisInfo {
class KeyLayoutMap {
public:
static base::Result<std::shared_ptr<KeyLayoutMap>> load(const std::string& filename);
- static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer);
static base::Result<std::shared_ptr<KeyLayoutMap>> loadContents(const std::string& filename,
const char* contents);
@@ -84,6 +82,8 @@ public:
virtual ~KeyLayoutMap();
private:
+ static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer);
+
struct Key {
int32_t keyCode;
uint32_t flags;