Skip to content

Commit 91e7fa2

Browse files
committed
InputReader: dump orientation as a string
Bug: 245989146 Test: with a mouse and keyboard connected, check `dumpsys input` Change-Id: Ief2dc41bcf59609fe22e2aba0c89877f7729351e
1 parent 1eea7c6 commit 91e7fa2

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

services/inputflinger/reader/mapper/CursorInputMapper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <optional>
2424

2525
#include <com_android_input_flags.h>
26+
#include <ftl/enum.h>
2627
#include <input/AccelerationCurve.h>
2728

2829
#include "CursorButtonAccumulator.h"
@@ -136,7 +137,7 @@ void CursorInputMapper::dump(std::string& dump) {
136137
dump += StringPrintf(INDENT3 "VWheelScale: %0.3f\n", mVWheelScale);
137138
dump += StringPrintf(INDENT3 "HWheelScale: %0.3f\n", mHWheelScale);
138139
dump += StringPrintf(INDENT3 "DisplayId: %s\n", toString(mDisplayId).c_str());
139-
dump += StringPrintf(INDENT3 "Orientation: %d\n", mOrientation);
140+
dump += StringPrintf(INDENT3 "Orientation: %s\n", ftl::enum_string(mOrientation).c_str());
140141
dump += StringPrintf(INDENT3 "ButtonState: 0x%08x\n", mButtonState);
141142
dump += StringPrintf(INDENT3 "Down: %s\n", toString(isPointerDown(mButtonState)));
142143
dump += StringPrintf(INDENT3 "DownTime: %" PRId64 "\n", mDownTime);

services/inputflinger/reader/mapper/KeyboardInputMapper.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include "KeyboardInputMapper.h"
2222

23+
#include <ftl/enum.h>
2324
#include <ui/Rotation.h>
2425

2526
namespace android {
@@ -143,7 +144,7 @@ void KeyboardInputMapper::dump(std::string& dump) {
143144
dump += INDENT2 "Keyboard Input Mapper:\n";
144145
dumpParameters(dump);
145146
dump += StringPrintf(INDENT3 "KeyboardType: %d\n", mKeyboardType);
146-
dump += StringPrintf(INDENT3 "Orientation: %d\n", getOrientation());
147+
dump += StringPrintf(INDENT3 "Orientation: %s\n", ftl::enum_string(getOrientation()).c_str());
147148
dump += StringPrintf(INDENT3 "KeyDowns: %zu keys currently down\n", mKeyDowns.size());
148149
dump += StringPrintf(INDENT3 "MetaState: 0x%0x\n", mMetaState);
149150
dump += INDENT3 "KeyboardLayoutInfo: ";

0 commit comments

Comments
 (0)