Merge "Change InputMessage.motion.pointerSize to a uint32_t." (4522f574) · Commits · e / devices / smdk4412 / android_frameworks_native

include/input/InputTransport.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ struct InputMessage {
		float yOffset;
		float xPrecision;
		float yPrecision;
		size_t pointerCount;
		uint32_t pointerCount;
		struct Pointer {
		PointerProperties properties;
		PointerCoords coords;
		@@ -234,7 +234,7 @@ public:
		float yPrecision,
		nsecs_t downTime,
		nsecs_t eventTime,
		size_t pointerCount,
		uint32_t pointerCount,
		const PointerProperties* pointerProperties,
		const PointerCoords* pointerCoords);

		@@ -360,7 +360,7 @@ private:
		void initializeFrom(const InputMessage* msg) {
		eventTime = msg->body.motion.eventTime;
		idBits.clear();
		for (size_t i = 0; i < msg->body.motion.pointerCount; i++) {
		for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) {
		uint32_t id = msg->body.motion.pointers[i].properties.id;
		idBits.markBit(id);
		idToIndex[id] = i;

libs/input/InputTransport.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ status_t InputPublisher::publishMotionEvent(
		float yPrecision,
		nsecs_t downTime,
		nsecs_t eventTime,
		size_t pointerCount,
		uint32_t pointerCount,
		const PointerProperties* pointerProperties,
		const PointerCoords* pointerCoords) {
		#if DEBUG_TRANSPORT_ACTIONS
		@@ -334,7 +334,7 @@ status_t InputPublisher::publishMotionEvent(
		msg.body.motion.downTime = downTime;
		msg.body.motion.eventTime = eventTime;
		msg.body.motion.pointerCount = pointerCount;
		for (size_t i = 0; i < pointerCount; i++) {
		for (uint32_t i = 0; i < pointerCount; i++) {
		msg.body.motion.pointers[i].properties.copyFrom(pointerProperties[i]);
		msg.body.motion.pointers[i].coords.copyFrom(pointerCoords[i]);
		}
		@@ -654,7 +654,7 @@ void InputConsumer::updateTouchState(InputMessage* msg) {
		}

		void InputConsumer::rewriteMessage(const TouchState& state, InputMessage* msg) {
		for (size_t i = 0; i < msg->body.motion.pointerCount; i++) {
		for (uint32_t i = 0; i < msg->body.motion.pointerCount; i++) {
		uint32_t id = msg->body.motion.pointers[i].properties.id;
		if (state.lastResample.idBits.hasBit(id)) {
		PointerCoords& msgCoords = msg->body.motion.pointers[i].coords;
		@@ -894,10 +894,10 @@ void InputConsumer::initializeKeyEvent(KeyEvent* event, const InputMessage* msg)
		}

		void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage* msg) {
		size_t pointerCount = msg->body.motion.pointerCount;
		uint32_t pointerCount = msg->body.motion.pointerCount;
		PointerProperties pointerProperties[pointerCount];
		PointerCoords pointerCoords[pointerCount];
		for (size_t i = 0; i < pointerCount; i++) {
		for (uint32_t i = 0; i < pointerCount; i++) {
		pointerProperties[i].copyFrom(msg->body.motion.pointers[i].properties);
		pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords);
		}
		@@ -922,9 +922,9 @@ void InputConsumer::initializeMotionEvent(MotionEvent* event, const InputMessage
		}

		void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) {
		size_t pointerCount = msg->body.motion.pointerCount;
		uint32_t pointerCount = msg->body.motion.pointerCount;
		PointerCoords pointerCoords[pointerCount];
		for (size_t i = 0; i < pointerCount; i++) {
		for (uint32_t i = 0; i < pointerCount; i++) {
		pointerCoords[i].copyFrom(msg->body.motion.pointers[i].coords);
		}

		@@ -934,7 +934,7 @@ void InputConsumer::addSample(MotionEvent* event, const InputMessage* msg) {

		bool InputConsumer::canAddSample(const Batch& batch, const InputMessage *msg) {
		const InputMessage& head = batch.samples.itemAt(0);
		size_t pointerCount = msg->body.motion.pointerCount;
		uint32_t pointerCount = msg->body.motion.pointerCount;
		if (head.body.motion.pointerCount != pointerCount
		\|\| head.body.motion.action != msg->body.motion.action) {
		return false;

services/inputflinger/InputDispatcher.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1965,7 +1965,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,
		xOffset = dispatchEntry->xOffset * scaleFactor;
		yOffset = dispatchEntry->yOffset * scaleFactor;
		if (scaleFactor != 1.0f) {
		for (size_t i = 0; i < motionEntry->pointerCount; i++) {
		for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
		scaledCoords[i] = motionEntry->pointerCoords[i];
		scaledCoords[i].scale(scaleFactor);
		}
		@@ -1978,7 +1978,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime,

		// We don't want the dispatch target to know.
		if (dispatchEntry->targetFlags & InputTarget::FLAG_ZERO_COORDS) {
		for (size_t i = 0; i < motionEntry->pointerCount; i++) {
		for (uint32_t i = 0; i < motionEntry->pointerCount; i++) {
		scaledCoords[i].clear();
		}
		usingCoords = scaledCoords;