Merge "Use uint32_t for input source" (aa5a4f11) · Commits · e / os / platform_frameworks_native

include/input/Input.h

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -354,9 +354,9 @@ public:

	inline int32_t getDeviceId() const { return mDeviceId; }		inline int32_t getDeviceId() const { return mDeviceId; }

	inline int32_t getSource() const { return mSource; }		inline uint32_t getSource() const { return mSource; }

	inline void setSource(int32_t source) { mSource = source; }		inline void setSource(uint32_t source) { mSource = source; }

	inline int32_t getDisplayId() const { return mDisplayId; }		inline int32_t getDisplayId() const { return mDisplayId; }

	@@ -365,12 +365,12 @@ public:
	inline std::array<uint8_t, 32> getHmac() const { return mHmac; }		inline std::array<uint8_t, 32> getHmac() const { return mHmac; }

	protected:		protected:
	void initialize(int32_t deviceId, int32_t source, int32_t displayId,		void initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac);		std::array<uint8_t, 32> hmac);
	void initialize(const InputEvent& from);		void initialize(const InputEvent& from);

	int32_t mDeviceId;		int32_t mDeviceId;
	int32_t mSource;		uint32_t mSource;
	int32_t mDisplayId;		int32_t mDisplayId;
	std::array<uint8_t, 32> mHmac;		std::array<uint8_t, 32> mHmac;
	};		};
	@@ -405,7 +405,7 @@ public:
	static const char* getLabel(int32_t keyCode);		static const char* getLabel(int32_t keyCode);
	static int32_t getKeyCodeFromLabel(const char* label);		static int32_t getKeyCodeFromLabel(const char* label);

	void initialize(int32_t deviceId, int32_t source, int32_t displayId,		void initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac, int32_t action, int32_t flags, int32_t keyCode,		std::array<uint8_t, 32> hmac, int32_t action, int32_t flags, int32_t keyCode,
	int32_t scanCode, int32_t metaState, int32_t repeatCount, nsecs_t downTime,		int32_t scanCode, int32_t metaState, int32_t repeatCount, nsecs_t downTime,
	nsecs_t eventTime);		nsecs_t eventTime);
	@@ -629,7 +629,7 @@ public:

	ssize_t findPointerIndex(int32_t pointerId) const;		ssize_t findPointerIndex(int32_t pointerId) const;

	void initialize(int32_t deviceId, int32_t source, int32_t displayId,		void initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,		std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,
	int32_t flags, int32_t edgeFlags, int32_t metaState, int32_t buttonState,		int32_t flags, int32_t edgeFlags, int32_t metaState, int32_t buttonState,
	MotionClassification classification, float xScale, float yScale, float xOffset,		MotionClassification classification, float xScale, float yScale, float xOffset,
	@@ -657,7 +657,7 @@ public:
	status_t writeToParcel(Parcel* parcel) const;		status_t writeToParcel(Parcel* parcel) const;
	#endif		#endif

	static bool isTouchEvent(int32_t source, int32_t action);		static bool isTouchEvent(uint32_t source, int32_t action);
	inline bool isTouchEvent() const {		inline bool isTouchEvent() const {
	return isTouchEvent(mSource, mAction);		return isTouchEvent(mSource, mAction);
	}		}

libs/input/Input.cpp

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -57,7 +57,7 @@ const char* inputEventTypeToString(int32_t type) {
	return "UNKNOWN";		return "UNKNOWN";
	}		}

	void InputEvent::initialize(int32_t deviceId, int32_t source, int32_t displayId,		void InputEvent::initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac) {		std::array<uint8_t, 32> hmac) {
	mDeviceId = deviceId;		mDeviceId = deviceId;
	mSource = source;		mSource = source;
	@@ -82,7 +82,7 @@ int32_t KeyEvent::getKeyCodeFromLabel(const char* label) {
	return getKeyCodeByLabel(label);		return getKeyCodeByLabel(label);
	}		}

	void KeyEvent::initialize(int32_t deviceId, int32_t source, int32_t displayId,		void KeyEvent::initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac, int32_t action, int32_t flags,		std::array<uint8_t, 32> hmac, int32_t action, int32_t flags,
	int32_t keyCode, int32_t scanCode, int32_t metaState, int32_t repeatCount,		int32_t keyCode, int32_t scanCode, int32_t metaState, int32_t repeatCount,
	nsecs_t downTime, nsecs_t eventTime) {		nsecs_t downTime, nsecs_t eventTime) {
	@@ -245,7 +245,7 @@ void PointerProperties::copyFrom(const PointerProperties& other) {

	// --- MotionEvent ---		// --- MotionEvent ---

	void MotionEvent::initialize(int32_t deviceId, int32_t source, int32_t displayId,		void MotionEvent::initialize(int32_t deviceId, uint32_t source, int32_t displayId,
	std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,		std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,
	int32_t flags, int32_t edgeFlags, int32_t metaState,		int32_t flags, int32_t edgeFlags, int32_t metaState,
	int32_t buttonState, MotionClassification classification, float xScale,		int32_t buttonState, MotionClassification classification, float xScale,
	@@ -488,7 +488,7 @@ status_t MotionEvent::readFromParcel(Parcel* parcel) {
	}		}

	mDeviceId = parcel->readInt32();		mDeviceId = parcel->readInt32();
	mSource = parcel->readInt32();		mSource = parcel->readUint32();
	mDisplayId = parcel->readInt32();		mDisplayId = parcel->readInt32();
	std::vector<uint8_t> hmac;		std::vector<uint8_t> hmac;
	status_t result = parcel->readByteVector(&hmac);		status_t result = parcel->readByteVector(&hmac);
	@@ -549,7 +549,7 @@ status_t MotionEvent::writeToParcel(Parcel* parcel) const {
	parcel->writeInt32(sampleCount);		parcel->writeInt32(sampleCount);

	parcel->writeInt32(mDeviceId);		parcel->writeInt32(mDeviceId);
	parcel->writeInt32(mSource);		parcel->writeUint32(mSource);
	parcel->writeInt32(mDisplayId);		parcel->writeInt32(mDisplayId);
	std::vector<uint8_t> hmac(mHmac.begin(), mHmac.end());		std::vector<uint8_t> hmac(mHmac.begin(), mHmac.end());
	parcel->writeByteVector(hmac);		parcel->writeByteVector(hmac);
	@@ -590,7 +590,7 @@ status_t MotionEvent::writeToParcel(Parcel* parcel) const {
	}		}
	#endif		#endif

	bool MotionEvent::isTouchEvent(int32_t source, int32_t action) {		bool MotionEvent::isTouchEvent(uint32_t source, int32_t action) {
	if (source & AINPUT_SOURCE_CLASS_POINTER) {		if (source & AINPUT_SOURCE_CLASS_POINTER) {
	// Specifically excludes HOVER_MOVE and SCROLL.		// Specifically excludes HOVER_MOVE and SCROLL.
	switch (action & AMOTION_EVENT_ACTION_MASK) {		switch (action & AMOTION_EVENT_ACTION_MASK) {

libs/input/tests/InputEvent_test.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ TEST_F(KeyEventTest, Properties) {

	ASSERT_EQ(AINPUT_EVENT_TYPE_KEY, event.getType());		ASSERT_EQ(AINPUT_EVENT_TYPE_KEY, event.getType());
	ASSERT_EQ(2, event.getDeviceId());		ASSERT_EQ(2, event.getDeviceId());
	ASSERT_EQ(static_cast<int>(AINPUT_SOURCE_GAMEPAD), event.getSource());		ASSERT_EQ(AINPUT_SOURCE_GAMEPAD, event.getSource());
	ASSERT_EQ(DISPLAY_ID, event.getDisplayId());		ASSERT_EQ(DISPLAY_ID, event.getDisplayId());
	EXPECT_EQ(HMAC, event.getHmac());		EXPECT_EQ(HMAC, event.getHmac());
	ASSERT_EQ(AKEY_EVENT_ACTION_DOWN, event.getAction());		ASSERT_EQ(AKEY_EVENT_ACTION_DOWN, event.getAction());
	@@ -203,7 +203,7 @@ TEST_F(KeyEventTest, Properties) {

	// Set source.		// Set source.
	event.setSource(AINPUT_SOURCE_JOYSTICK);		event.setSource(AINPUT_SOURCE_JOYSTICK);
	ASSERT_EQ(static_cast<int>(AINPUT_SOURCE_JOYSTICK), event.getSource());		ASSERT_EQ(AINPUT_SOURCE_JOYSTICK, event.getSource());

	// Set display id.		// Set display id.
	constexpr int32_t newDisplayId = 2;		constexpr int32_t newDisplayId = 2;
	@@ -311,7 +311,7 @@ void MotionEventTest::assertEqualsEventWithHistory(const MotionEvent* event) {
	// Check properties.		// Check properties.
	ASSERT_EQ(AINPUT_EVENT_TYPE_MOTION, event->getType());		ASSERT_EQ(AINPUT_EVENT_TYPE_MOTION, event->getType());
	ASSERT_EQ(2, event->getDeviceId());		ASSERT_EQ(2, event->getDeviceId());
	ASSERT_EQ(static_cast<int>(AINPUT_SOURCE_TOUCHSCREEN), event->getSource());		ASSERT_EQ(AINPUT_SOURCE_TOUCHSCREEN, event->getSource());
	ASSERT_EQ(DISPLAY_ID, event->getDisplayId());		ASSERT_EQ(DISPLAY_ID, event->getDisplayId());
	EXPECT_EQ(HMAC, event->getHmac());		EXPECT_EQ(HMAC, event->getHmac());
	ASSERT_EQ(AMOTION_EVENT_ACTION_MOVE, event->getAction());		ASSERT_EQ(AMOTION_EVENT_ACTION_MOVE, event->getAction());
	@@ -448,7 +448,7 @@ TEST_F(MotionEventTest, Properties) {

	// Set source.		// Set source.
	event.setSource(AINPUT_SOURCE_JOYSTICK);		event.setSource(AINPUT_SOURCE_JOYSTICK);
	ASSERT_EQ(static_cast<int>(AINPUT_SOURCE_JOYSTICK), event.getSource());		ASSERT_EQ(AINPUT_SOURCE_JOYSTICK, event.getSource());

	// Set displayId.		// Set displayId.
	constexpr int32_t newDisplayId = 2;		constexpr int32_t newDisplayId = 2;

libs/input/tests/InputPublisherAndConsumer_test.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,7 @@ void InputPublisherAndConsumerTest::PublishAndConsumeKeyEvent() {

	constexpr uint32_t seq = 15;		constexpr uint32_t seq = 15;
	constexpr int32_t deviceId = 1;		constexpr int32_t deviceId = 1;
	constexpr int32_t source = AINPUT_SOURCE_KEYBOARD;		constexpr uint32_t source = AINPUT_SOURCE_KEYBOARD;
	constexpr int32_t displayId = ADISPLAY_ID_DEFAULT;		constexpr int32_t displayId = ADISPLAY_ID_DEFAULT;
	constexpr std::array<uint8_t, 32> hmac = {31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21,		constexpr std::array<uint8_t, 32> hmac = {31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21,
	20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10,		20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10,
	@@ -139,7 +139,7 @@ void InputPublisherAndConsumerTest::PublishAndConsumeMotionEvent() {

	constexpr uint32_t seq = 15;		constexpr uint32_t seq = 15;
	constexpr int32_t deviceId = 1;		constexpr int32_t deviceId = 1;
	constexpr int32_t source = AINPUT_SOURCE_TOUCHSCREEN;		constexpr uint32_t source = AINPUT_SOURCE_TOUCHSCREEN;
	constexpr int32_t displayId = ADISPLAY_ID_DEFAULT;		constexpr int32_t displayId = ADISPLAY_ID_DEFAULT;
	constexpr std::array<uint8_t, 32> hmac = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,		constexpr std::array<uint8_t, 32> hmac = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
	11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,		11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,