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

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

DO NOT MERGE Do not crash when invalid event is received am: 4ca9727b 

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



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

services/inputflinger/dispatcher/InputDispatcher.cpp

+6 −3
Original line number Diff line number Diff line
@@ -4178,9 +4178,12 @@ void InputDispatcher::notifyMotion(const NotifyMotionArgs* args) { 
                  args->pointerCoords[i].getAxisValue(AMOTION_EVENT_AXIS_ORIENTATION));

        }

    }

    LOG_ALWAYS_FATAL_IF(!validateMotionEvent(args->action, args->actionButton, args->pointerCount,

                                             args->pointerProperties),

                        "Invalid event: %s", args->dump().c_str());



    if (!validateMotionEvent(args->action, args->actionButton, args->pointerCount,

                             args->pointerProperties)) {

        LOG(ERROR) << "Invalid event: " << args->dump();

        return;

    }



    uint32_t policyFlags = args->policyFlags;

    policyFlags |= POLICY_FLAG_TRUSTED;