Merge "inputflinger: include units for eventTime in entry dumps" into main (beee6899) · Commits · e / os / android_frameworks_native

libs/input/Input.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -452,8 +452,8 @@ std::ostream& operator<<(std::ostream& out, const KeyEvent& event) {
		out << ", metaState=" << event.getMetaState();
		}

		out << ", eventTime=" << event.getEventTime();
		out << ", downTime=" << event.getDownTime();
		out << ", eventTime=" << event.getEventTime() << "ns";
		out << ", downTime=" << event.getDownTime() << "ns";
		out << ", flags=" << std::hex << event.getFlags() << std::dec;
		out << ", repeatCount=" << event.getRepeatCount();
		out << ", deviceId=" << event.getDeviceId();
		@@ -1199,7 +1199,7 @@ std::string MotionEvent::safeDump() const {
		if (mEdgeFlags != 0) {
		out << ", mEdgeFlags=" << mEdgeFlags;
		}
		out << ", mDownTime=" << mDownTime;
		out << ", mDownTime=" << mDownTime << "ns";
		out << ", mDeviceId=" << mDeviceId;
		out << ", mSource=" << inputEventSourceToString(mSource);
		out << ", mDisplayId=" << mDisplayId;
		@@ -1265,8 +1265,8 @@ std::ostream& operator<<(std::ostream& out, const MotionEvent& event) {
		if (event.getHistorySize() != 0) {
		out << ", historySize=" << event.getHistorySize();
		}
		out << ", eventTime=" << event.getEventTime();
		out << ", downTime=" << event.getDownTime();
		out << ", eventTime=" << event.getEventTime() << "ns";
		out << ", downTime=" << event.getDownTime() << "ns";
		out << ", deviceId=" << event.getDeviceId();
		out << ", source=" << inputEventSourceToString(event.getSource());
		out << ", displayId=" << event.getDisplayId();

+4 −4

Original line number	Diff line number	Diff line
		@@ -554,7 +554,7 @@ status_t InputPublisher::publishKeyEvent(uint32_t seq, int32_t eventId, int32_t
		ALOGD_IF(debugTransportPublisher(),
		"channel '%s' publisher ~ %s: seq=%u, id=%d, deviceId=%d, source=%s, "
		"action=%s, flags=0x%x, keyCode=%s, scanCode=%d, metaState=0x%x, repeatCount=%d, "
		"downTime=%" PRId64 ", eventTime=%" PRId64,
		"downTime=%" PRId64 "ns, eventTime=%" PRId64 "ns",
		mChannel->getName().c_str(), __func__, seq, eventId, deviceId,
		inputEventSourceToString(source).c_str(), KeyEvent::actionToString(action), flags,
		KeyEvent::getLabel(keyCode), scanCode, metaState, repeatCount, downTime, eventTime);
		@@ -603,7 +603,7 @@ status_t InputPublisher::publishMotionEvent(
		"displayId=%s, "
		"action=%s, actionButton=0x%08x, flags=0x%x, edgeFlags=0x%x, "
		"metaState=0x%x, buttonState=0x%x, classification=%s, "
		"xPrecision=%f, yPrecision=%f, downTime=%" PRId64 ", eventTime=%" PRId64 ", "
		"xPrecision=%f, yPrecision=%f, downTime=%" PRId64 "ns, eventTime=%" PRId64 "ns, "
		"pointerCount=%" PRIu32 "\n%s",
		mChannel->getName().c_str(), __func__, seq, eventId, deviceId,
		inputEventSourceToString(source).c_str(), displayId.toString().c_str(),

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@ void VelocityTracker::addMovement(nsecs_t eventTime, int32_t pointerId, int32_t

		if (DEBUG_VELOCITY) {
		LOG(INFO) << "VelocityTracker: addMovement axis=" << MotionEvent::getLabel(axis)
		<< ", eventTime=" << eventTime << ", pointerId=" << pointerId
		<< ", eventTime=" << eventTime << "ns, pointerId=" << pointerId
		<< ", activePointerId=" << toString(mActivePointerId) << ", position=" << position
		<< ", velocity=" << toString(getVelocity(axis, pointerId));
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -133,8 +133,9 @@ std::string NotifyMotionArgs::dump() const {
		}
		coords += "}";
		}
		return StringPrintf("NotifyMotionArgs(id=%" PRId32 ", eventTime=%" PRId64 ", deviceId=%" PRId32
		", source=%s, action=%s, pointerCount=%zu pointers=%s, flags=0x%08x)",
		return StringPrintf("NotifyMotionArgs(id=%" PRId32 ", eventTime=%" PRId64 "ns, "
		"deviceId=%" PRId32 ", source=%s, action=%s, pointerCount=%zu, "
		"pointers=%s, flags=0x%08x)",
		id, eventTime, deviceId, inputEventSourceToString(source).c_str(),
		MotionEvent::actionToString(action).c_str(), getPointerCount(),
		coords.c_str(), flags);

+3 −4

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ std::string KeyEntry::getDescription() const {
		if (!IS_DEBUGGABLE_BUILD) {
		return "KeyEvent";
		}
		return StringPrintf("KeyEvent(deviceId=%d, eventTime=%" PRIu64 ", source=%s, displayId=%s, "
		return StringPrintf("KeyEvent(deviceId=%d, eventTime=%" PRIu64 "ns, source=%s, displayId=%s, "
		"action=%s, "
		"flags=0x%08x, keyCode=%s(%d), scanCode=%d, metaState=0x%08x, "
		"repeatCount=%d), policyFlags=0x%08x",
		@@ -211,9 +211,8 @@ std::string MotionEntry::getDescription() const {
		return "MotionEvent";
		}
		std::string msg;
		msg += StringPrintf("MotionEvent(deviceId=%d, eventTime=%" PRIu64
		", source=%s, displayId=%s, action=%s, actionButton=0x%08x, flags=0x%08x,"
		" metaState=0x%08x, "
		msg += StringPrintf("MotionEvent(deviceId=%d, eventTime=%" PRIu64 "ns, source=%s, displayId=%s,"
		"action=%s, actionButton=0x%08x, flags=0x%08x, metaState=0x%08x, "
		"buttonState=0x%08x, "
		"classification=%s, edgeFlags=0x%08x, xPrecision=%.1f, yPrecision=%.1f, "
		"xCursorPosition=%0.1f, yCursorPosition=%0.1f, pointers=[",