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

Commit cb923210 authored by chaviw's avatar chaviw
Browse files

Remove layer from window handle since it's no longer used 

Fixes: 146671630
Test: Builds and runs
Change-Id: I095228a361ecdda8e1abd48c6d32b085b0dd20cf
parent 6f6e2305

include/input/InputWindow.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ struct InputWindowInfo { 
    bool hasFocus;

    bool hasWallpaper;

    bool paused;

    int32_t layer;

    int32_t ownerPid;

    int32_t ownerUid;

    int32_t inputFeatures;

libs/input/InputWindow.cpp

+0 −2
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ status_t InputWindowInfo::write(Parcel& output) const { 
    output.writeBool(hasFocus);

    output.writeBool(hasWallpaper);

    output.writeBool(paused);

    output.writeInt32(layer);

    output.writeInt32(ownerPid);

    output.writeInt32(ownerUid);

    output.writeInt32(inputFeatures);
@@ -135,7 +134,6 @@ InputWindowInfo InputWindowInfo::read(const Parcel& from) { 
    ret.hasFocus = from.readBool();

    ret.hasWallpaper = from.readBool();

    ret.paused = from.readBool();

    ret.layer = from.readInt32();

    ret.ownerPid = from.readInt32();

    ret.ownerUid = from.readInt32();

    ret.inputFeatures = from.readInt32();

libs/input/tests/InputWindow_test.cpp

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ TEST(InputWindowInfo, Parcelling) { 
    i.hasFocus = false;

    i.hasWallpaper = false;

    i.paused = false;

    i.layer = 7;

    i.ownerPid = 19;

    i.ownerUid = 24;

    i.inputFeatures = 29;
@@ -91,7 +90,6 @@ TEST(InputWindowInfo, Parcelling) { 
    ASSERT_EQ(i.hasFocus, i2.hasFocus);

    ASSERT_EQ(i.hasWallpaper, i2.hasWallpaper);

    ASSERT_EQ(i.paused, i2.paused);

    ASSERT_EQ(i.layer, i2.layer);

    ASSERT_EQ(i.ownerPid, i2.ownerPid);

    ASSERT_EQ(i.ownerUid, i2.ownerUid);

    ASSERT_EQ(i.inputFeatures, i2.inputFeatures);

services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ public: 
        mInfo.hasFocus = true;

        mInfo.hasWallpaper = false;

        mInfo.paused = false;

        mInfo.layer = 0;

        mInfo.ownerPid = INJECTOR_PID;

        mInfo.ownerUid = INJECTOR_UID;

        mInfo.inputFeatures = 0;

services/inputflinger/dispatcher/InputDispatcher.cpp

+7 −10
Original line number Diff line number Diff line
@@ -3793,12 +3793,10 @@ void InputDispatcher::dumpDispatchStateLocked(std::string& dump) { 


                    dump += StringPrintf(INDENT3 "%zu: name='%s', displayId=%d, "

                                                 "portalToDisplayId=%d, paused=%s, hasFocus=%s, "

                                                 "hasWallpaper=%s, "

                                                 "visible=%s, canReceiveKeys=%s, flags=0x%08x, "

                                                 "type=0x%08x, layer=%d, "

                                                 "hasWallpaper=%s, visible=%s, canReceiveKeys=%s, "

                                                 "flags=0x%08x, type=0x%08x, "

                                                 "frame=[%d,%d][%d,%d], globalScale=%f, "

                                                 "windowScale=(%f,%f), "

                                                 "touchableRegion=",

                                                 "windowScale=(%f,%f), touchableRegion=",

                                         i, windowInfo->name.c_str(), windowInfo->displayId,

                                         windowInfo->portalToDisplayId,

                                         toString(windowInfo->paused),
@@ -3807,11 +3805,10 @@ void InputDispatcher::dumpDispatchStateLocked(std::string& dump) { 
                                         toString(windowInfo->visible),

                                         toString(windowInfo->canReceiveKeys),

                                         windowInfo->layoutParamsFlags,

                                         windowInfo->layoutParamsType, windowInfo->layer,

                                         windowInfo->frameLeft, windowInfo->frameTop,

                                         windowInfo->frameRight, windowInfo->frameBottom,

                                         windowInfo->globalScaleFactor, windowInfo->windowXScale,

                                         windowInfo->windowYScale);

                                         windowInfo->layoutParamsType, windowInfo->frameLeft,

                                         windowInfo->frameTop, windowInfo->frameRight,

                                         windowInfo->frameBottom, windowInfo->globalScaleFactor,

                                         windowInfo->windowXScale, windowInfo->windowYScale);

                    dumpRegion(dump, windowInfo->touchableRegion);

                    dump += StringPrintf(", inputFeatures=0x%08x", windowInfo->inputFeatures);

                    dump += StringPrintf(", ownerPid=%d, ownerUid=%d, dispatchingTimeout=%0.3fms\n",