diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-12-19 01:19:14 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-12-19 01:19:14 -0800 |
| commit | a03f8314b13d88e2300408b7e502bc6ecf1f5196 (patch) | |
| tree | 9f95d8b94a8592d29d46e91016e2c5a7f163ad30 | |
| parent | 32adbb55dc8a3cf18f42c96b4f2ee45f252fd876 (diff) | |
| parent | 8db56902374699eb08a5716b12fee92c8ba7b661 (diff) | |
| download | common-a03f8314b13d88e2300408b7e502bc6ecf1f5196.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 478053055
Change-Id: I50475725b619b4ee7146460e524e59a42985bc66
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | goog_touch_interface.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/goog_touch_interface.c b/goog_touch_interface.c index 579c8e2..ccf5644 100644 --- a/goog_touch_interface.c +++ b/goog_touch_interface.c @@ -1847,8 +1847,7 @@ void goog_offload_populate_frame(struct goog_touch_interface *gti, } ATRACE_END(); } else { - GOOG_ERR(gti, "%s - unrecognized channel_type = %u\n", - __func__, channel_type); + GOOG_ERR(gti, "unrecognized channel_type %#x.\n", channel_type); } if (ret) { @@ -2264,7 +2263,8 @@ void goog_input_mt_report_slot_state( if (goog_input_legacy_report(gti)) input_mt_report_slot_state(dev, tool_type, active); - if (tool_type == MT_TOOL_FINGER) { + switch (tool_type) { + case MT_TOOL_FINGER: if (active) { gti->offload.coords[gti->slot].status = COORD_STATUS_FINGER; if (!test_and_set_bit(gti->slot, @@ -2278,7 +2278,16 @@ void goog_input_mt_report_slot_state( set_bit(gti->slot, >i->slot_bit_changed); } } + break; + + default: + if (!goog_input_legacy_report(gti)) { + GOOG_WARN(gti, "unexcepted input tool_type(%#x) active(%d)!\n", + tool_type, active); + } + break; } + } EXPORT_SYMBOL(goog_input_mt_report_slot_state); |