Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 653739c1 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Add log for events dropped by InputState am: c94dafee am: 4b87d869 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23452576



Change-Id: I71b60ac527775c813261bfb08e0aecfbe7d275e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82588490 4b87d869

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −10
Original line number Diff line number Diff line
@@ -3292,11 +3292,8 @@ void InputDispatcher::enqueueDispatchEntryLocked(const std::shared_ptr<Connectio 


            if (!connection->inputState.trackKey(keyEntry, dispatchEntry->resolvedAction,

                                                 dispatchEntry->resolvedFlags)) {

                if (DEBUG_DISPATCH_CYCLE) {

                    ALOGD("channel '%s' ~ enqueueDispatchEntryLocked: skipping inconsistent key "

                          "event",

                          connection->getInputChannelName().c_str());

                }

                LOG(WARNING) << "channel " << connection->getInputChannelName()

                             << "~ dropping inconsistent event: " << *dispatchEntry;

                return; // skip the inconsistent event

            }

            break;
@@ -3349,11 +3346,8 @@ void InputDispatcher::enqueueDispatchEntryLocked(const std::shared_ptr<Connectio 


            if (!connection->inputState.trackMotion(motionEntry, dispatchEntry->resolvedAction,

                                                    dispatchEntry->resolvedFlags)) {

                if (DEBUG_DISPATCH_CYCLE) {

                    ALOGD("channel '%s' ~ enqueueDispatchEntryLocked: skipping inconsistent motion "

                          "event",

                          connection->getInputChannelName().c_str());

                }

                LOG(WARNING) << "channel " << connection->getInputChannelName()

                             << "~ dropping inconsistent event: " << *dispatchEntry;

                return; // skip the inconsistent event

            }

services/inputflinger/dispatcher/InputState.cpp

+3 −15
Original line number Diff line number Diff line
@@ -93,11 +93,7 @@ bool InputState::trackMotion(const MotionEntry& entry, int32_t action, int32_t f 
                mMotionMementos.erase(mMotionMementos.begin() + index);

                return true;

            }

            if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                ALOGD("Dropping inconsistent motion up or cancel event: deviceId=%d, source=%08x, "

                      "displayId=%" PRId32 ", actionMasked=%d",

                      entry.deviceId, entry.source, entry.displayId, actionMasked);

            }



            return false;

        }
@@ -150,11 +146,7 @@ bool InputState::trackMotion(const MotionEntry& entry, int32_t action, int32_t f 
                    return true;

                }

            }

            if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                ALOGD("Dropping inconsistent motion pointer up/down or move event: "

                      "deviceId=%d, source=%08x, displayId=%" PRId32 ", actionMasked=%d",

                      entry.deviceId, entry.source, entry.displayId, actionMasked);

            }



            return false;

        }
@@ -164,11 +156,7 @@ bool InputState::trackMotion(const MotionEntry& entry, int32_t action, int32_t f 
                mMotionMementos.erase(mMotionMementos.begin() + index);

                return true;

            }

            if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                ALOGD("Dropping inconsistent motion hover exit event: deviceId=%d, source=%08x, "

                      "displayId=%" PRId32,

                      entry.deviceId, entry.source, entry.displayId);

            }



            return false;

        }