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

Unverified Commit 5c2b1857 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r53' into staging/lineage-16.0_merge-android-9.0.0_r53 

Android 9.0.0 Release 53 (6107734)

* tag 'android-9.0.0_r53':
  Don't leak input events to dumpsys on user builds
  Resize object capacity when shrinking Parcel

Change-Id: Ibfd378016846a4693a20a5d1c894bb0a7964dd42
parents 33f64355 755b9514

libs/binder/Parcel.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2713,11 +2713,13 @@ status_t Parcel::continueWrite(size_t desired) 
            if (objectsSize == 0) {

                free(mObjects);

                mObjects = nullptr;

                mObjectsCapacity = 0;

            } else {

                binder_size_t* objects =

                    (binder_size_t*)realloc(mObjects, objectsSize*sizeof(binder_size_t));

                if (objects) {

                    mObjects = objects;

                    mObjectsCapacity = objectsSize;

                }

            }

            mObjectsSize = objectsSize;

services/inputflinger/InputDispatcher.cpp

+2 −48
Original line number Diff line number Diff line
@@ -105,36 +105,6 @@ static inline const char* toString(bool value) { 
    return value ? "true" : "false";

}



static std::string motionActionToString(int32_t action) {

    // Convert MotionEvent action to string

    switch(action & AMOTION_EVENT_ACTION_MASK) {

        case AMOTION_EVENT_ACTION_DOWN:

            return "DOWN";

        case AMOTION_EVENT_ACTION_MOVE:

            return "MOVE";

        case AMOTION_EVENT_ACTION_UP:

            return "UP";

        case AMOTION_EVENT_ACTION_POINTER_DOWN:

            return "POINTER_DOWN";

        case AMOTION_EVENT_ACTION_POINTER_UP:

            return "POINTER_UP";

    }

    return StringPrintf("%" PRId32, action);

}



static std::string keyActionToString(int32_t action) {

    // Convert KeyEvent action to string

    switch(action) {

        case AKEY_EVENT_ACTION_DOWN:

            return "DOWN";

        case AKEY_EVENT_ACTION_UP:

            return "UP";

        case AKEY_EVENT_ACTION_MULTIPLE:

            return "MULTIPLE";

    }

    return StringPrintf("%" PRId32, action);

}



static inline int32_t getMotionEventActionPointerIndex(int32_t action) {

    return (action & AMOTION_EVENT_ACTION_POINTER_INDEX_MASK)

            >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
@@ -4024,11 +3994,7 @@ InputDispatcher::KeyEntry::~KeyEntry() { 
}



void InputDispatcher::KeyEntry::appendDescription(std::string& msg) const {

    msg += StringPrintf("KeyEvent(deviceId=%d, source=0x%08x, action=%s, "

            "flags=0x%08x, keyCode=%d, scanCode=%d, metaState=0x%08x, "

            "repeatCount=%d), policyFlags=0x%08x",

            deviceId, source, keyActionToString(action).c_str(), flags, keyCode,

            scanCode, metaState, repeatCount, policyFlags);

    msg += StringPrintf("KeyEvent");

}



void InputDispatcher::KeyEntry::recycle() {
@@ -4069,19 +4035,7 @@ InputDispatcher::MotionEntry::~MotionEntry() { 
}



void InputDispatcher::MotionEntry::appendDescription(std::string& msg) const {

    msg += StringPrintf("MotionEvent(deviceId=%d, source=0x%08x, action=%s, actionButton=0x%08x, "

            "flags=0x%08x, metaState=0x%08x, buttonState=0x%08x, "

            "edgeFlags=0x%08x, xPrecision=%.1f, yPrecision=%.1f, displayId=%d, pointers=[",

            deviceId, source, motionActionToString(action).c_str(), actionButton, flags, metaState,

            buttonState, edgeFlags, xPrecision, yPrecision, displayId);

    for (uint32_t i = 0; i < pointerCount; i++) {

        if (i) {

            msg += ", ";

        }

        msg += StringPrintf("%d: (%.1f, %.1f)", pointerProperties[i].id,

                pointerCoords[i].getX(), pointerCoords[i].getY());

    }

    msg += StringPrintf("]), policyFlags=0x%08x", policyFlags);

    msg += StringPrintf("MotionEvent");

}