Merge "Don't leak input events to dumpsys on user builds" into oc-dev am: ff849d65da am: 99b292950f (d2a3e9b3) · Commits · e / devices / smdk4412 / android_frameworks_native

services/inputflinger/InputDispatcher.cpp

+2 −18

Original line number	Original line	Diff line number	Diff line
	@@ -3943,11 +3943,7 @@ InputDispatcher::KeyEntry::~KeyEntry() {
	}		}

	void InputDispatcher::KeyEntry::appendDescription(String8& msg) const {		void InputDispatcher::KeyEntry::appendDescription(String8& msg) const {
	msg.appendFormat("KeyEvent(deviceId=%d, source=0x%08x, action=%d, "		msg.appendFormat("KeyEvent");
	"flags=0x%08x, keyCode=%d, scanCode=%d, metaState=0x%08x, "
	"repeatCount=%d), policyFlags=0x%08x",
	deviceId, source, action, flags, keyCode, scanCode, metaState,
	repeatCount, policyFlags);
	}		}

	void InputDispatcher::KeyEntry::recycle() {		void InputDispatcher::KeyEntry::recycle() {
	@@ -3988,19 +3984,7 @@ InputDispatcher::MotionEntry::~MotionEntry() {
	}		}

	void InputDispatcher::MotionEntry::appendDescription(String8& msg) const {		void InputDispatcher::MotionEntry::appendDescription(String8& msg) const {
	msg.appendFormat("MotionEvent(deviceId=%d, source=0x%08x, action=%d, actionButton=0x%08x, "		msg.appendFormat("MotionEvent");
	"flags=0x%08x, metaState=0x%08x, buttonState=0x%08x, "
	"edgeFlags=0x%08x, xPrecision=%.1f, yPrecision=%.1f, displayId=%d, pointers=[",
	deviceId, source, action, actionButton, flags, metaState, buttonState, edgeFlags,
	xPrecision, yPrecision, displayId);
	for (uint32_t i = 0; i < pointerCount; i++) {
	if (i) {
	msg.append(", ");
	}
	msg.appendFormat("%d: (%.1f, %.1f)", pointerProperties[i].id,
	pointerCoords[i].getX(), pointerCoords[i].getY());
	}
	msg.appendFormat("]), policyFlags=0x%08x", policyFlags);
	}		}