diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-10 22:35:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-10 22:35:05 +0000 |
commit | 99b292950f123f497229921e3b885d98354d33db (patch) | |
tree | ffa90012a5c6b030df22b0fe8e48825bb906589f | |
parent | 7bd9c861ce55dd084c9de828a1545aaacd1b4c70 (diff) | |
parent | ff849d65da2a30643f0d4ed5d3225ce4f2af9608 (diff) | |
download | native-99b292950f123f497229921e3b885d98354d33db.tar.gz |
Merge "Don't leak input events to dumpsys on user builds" into oc-dev am: ff849d65da
Change-Id: Ic7268a93a350f94884a6d0b8a1e4992bb0e5faf0
-rw-r--r-- | services/inputflinger/InputDispatcher.cpp | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/services/inputflinger/InputDispatcher.cpp b/services/inputflinger/InputDispatcher.cpp index 69067d225b..3a0198b79b 100644 --- a/services/inputflinger/InputDispatcher.cpp +++ b/services/inputflinger/InputDispatcher.cpp @@ -3943,11 +3943,7 @@ InputDispatcher::KeyEntry::~KeyEntry() { } void InputDispatcher::KeyEntry::appendDescription(String8& msg) const { - msg.appendFormat("KeyEvent(deviceId=%d, source=0x%08x, action=%d, " - "flags=0x%08x, keyCode=%d, scanCode=%d, metaState=0x%08x, " - "repeatCount=%d), policyFlags=0x%08x", - deviceId, source, action, flags, keyCode, scanCode, metaState, - repeatCount, policyFlags); + msg.appendFormat("KeyEvent"); } void InputDispatcher::KeyEntry::recycle() { @@ -3988,19 +3984,7 @@ InputDispatcher::MotionEntry::~MotionEntry() { } void InputDispatcher::MotionEntry::appendDescription(String8& msg) const { - msg.appendFormat("MotionEvent(deviceId=%d, source=0x%08x, action=%d, actionButton=0x%08x, " - "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); + msg.appendFormat("MotionEvent"); } |