diff options
| author | 2023-10-05 15:40:38 -0700 | |
|---|---|---|
| committer | 2023-10-05 15:40:38 -0700 | |
| commit | 1961b2f7b191744f3fc6bb4d32f0da0ce3ee0567 (patch) | |
| tree | b9785db180fb54b3a776f645cbb2a7ef480e0cb9 /include/input/KeyLayoutMap.h | |
| parent | e4b64ebecf894e3047e46894a83ab8d37feabd3e (diff) | |
| parent | 313d1596d818bc94fbab3d42b8c50306871f74a5 (diff) | |
Merge Android 14
Bug: 298295554
Merged-In: I114a4cf83978f152959a6ec244d322603ff5257b
Change-Id: Ia35ae6e11052fcc3b2bdaabd6dc57d0d223de269
Diffstat (limited to 'include/input/KeyLayoutMap.h')
| -rw-r--r-- | include/input/KeyLayoutMap.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/input/KeyLayoutMap.h b/include/input/KeyLayoutMap.h index d36d28cac9..8c3c74af20 100644 --- a/include/input/KeyLayoutMap.h +++ b/include/input/KeyLayoutMap.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef _LIBINPUT_KEY_LAYOUT_MAP_H -#define _LIBINPUT_KEY_LAYOUT_MAP_H +#pragma once #include <android-base/result.h> #include <stdint.h> @@ -79,7 +78,7 @@ public: std::optional<AxisInfo> mapAxis(int32_t scanCode) const; const std::string getLoadFileName() const; // Return pair of sensor type and sensor data index, for the input device abs code - base::Result<std::pair<InputDeviceSensorType, int32_t>> mapSensor(int32_t absCode); + base::Result<std::pair<InputDeviceSensorType, int32_t>> mapSensor(int32_t absCode) const; virtual ~KeyLayoutMap(); @@ -132,5 +131,3 @@ private: }; } // namespace android - -#endif // _LIBINPUT_KEY_LAYOUT_MAP_H |