Merge "Fix libinput warnings" am: a4767442e3 am: a149886878 (fef00db3) · Commits · e / os / android_frameworks_native

include/input/Input.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ public:

		inline int32_t getButtonState() const { return mButtonState; }

		inline int32_t setButtonState(int32_t buttonState) { mButtonState = buttonState; }
		inline void setButtonState(int32_t buttonState) { mButtonState = buttonState; }

		inline int32_t getActionButton() const { return mActionButton; }

+7 −7

Original line number	Diff line number	Diff line
		@@ -425,30 +425,30 @@ static const char* lookupLabelByValue(int value, const InputEventLabel* list) {
		return NULL;
		}

		static int32_t getKeyCodeByLabel(const char* label) {
		static inline int32_t getKeyCodeByLabel(const char* label) {
		return int32_t(lookupValueByLabel(label, KEYCODES));
		}

		static const char* getLabelByKeyCode(int32_t keyCode) {
		if (keyCode >= 0 && keyCode < size(KEYCODES)) {
		static inline const char* getLabelByKeyCode(int32_t keyCode) {
		if (keyCode >= 0 && keyCode < static_cast<int32_t>(size(KEYCODES))) {
		return KEYCODES[keyCode].literal;
		}
		return NULL;
		}

		static uint32_t getKeyFlagByLabel(const char* label) {
		static inline uint32_t getKeyFlagByLabel(const char* label) {
		return uint32_t(lookupValueByLabel(label, FLAGS));
		}

		static int32_t getAxisByLabel(const char* label) {
		static inline int32_t getAxisByLabel(const char* label) {
		return int32_t(lookupValueByLabel(label, AXES));
		}

		static const char* getAxisLabel(int32_t axisId) {
		static inline const char* getAxisLabel(int32_t axisId) {
		return lookupLabelByValue(axisId, AXES);
		}

		static int32_t getLedByLabel(const char* label) {
		static inline int32_t getLedByLabel(const char* label) {
		return int32_t(lookupValueByLabel(label, LEDS));
		}