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

Commit 1c58c0d9 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

WindowInfo: Remove unused field portalToDisplayId 

Bug: None
Test: presubmit
Change-Id: If3d6ea21e47c87838c207cd9c08c6ea09d004b7c
parent e680f9bf

libs/gui/WindowInfo.cpp

+1 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ bool WindowInfo::operator==(const WindowInfo& info) const { 
            info.hasWallpaper == hasWallpaper && info.paused == paused &&

            info.ownerPid == ownerPid && info.ownerUid == ownerUid &&

            info.packageName == packageName && info.inputFeatures == inputFeatures &&

            info.displayId == displayId && info.portalToDisplayId == portalToDisplayId &&

            info.displayId == displayId &&

            info.replaceTouchableRegionWithCrop == replaceTouchableRegionWithCrop &&

            info.applicationInfo == applicationInfo;

}
@@ -116,7 +116,6 @@ status_t WindowInfo::writeToParcel(android::Parcel* parcel) const { 
        parcel->writeUtf8AsUtf16(packageName) ?:

        parcel->writeInt32(inputFeatures.get()) ?:

        parcel->writeInt32(displayId) ?:

        parcel->writeInt32(portalToDisplayId) ?:

        applicationInfo.writeToParcel(parcel) ?:

        parcel->write(touchableRegion) ?:

        parcel->writeBool(replaceTouchableRegionWithCrop) ?:
@@ -180,7 +179,6 @@ status_t WindowInfo::readFromParcel(const android::Parcel* parcel) { 
    inputFeatures = Flags<Feature>(parcel->readInt32());

    // clang-format off

    status = parcel->readInt32(&displayId) ?:

        parcel->readInt32(&portalToDisplayId) ?:

        applicationInfo.readFromParcel(parcel) ?:

        parcel->read(touchableRegion) ?:

        parcel->readBool(&replaceTouchableRegionWithCrop);

libs/gui/include/gui/WindowInfo.h

+0 −1
Original line number Diff line number Diff line
@@ -214,7 +214,6 @@ struct WindowInfo : public Parcelable { 
    std::string packageName;

    Flags<Feature> inputFeatures;

    int32_t displayId = ADISPLAY_ID_NONE;

    int32_t portalToDisplayId = ADISPLAY_ID_NONE;

    InputApplicationInfo applicationInfo;

    bool replaceTouchableRegionWithCrop = false;

    wp<IBinder> touchableRegionCropHandle;

libs/gui/tests/WindowInfo_test.cpp

+0 −2
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ TEST(WindowInfo, Parcelling) { 
    i.packageName = "com.example.package";

    i.inputFeatures = WindowInfo::Feature::DISABLE_USER_ACTIVITY;

    i.displayId = 34;

    i.portalToDisplayId = 2;

    i.replaceTouchableRegionWithCrop = true;

    i.touchableRegionCropHandle = touchableRegionCropHandle;

    i.applicationInfo.name = "ApplicationFooBar";
@@ -107,7 +106,6 @@ TEST(WindowInfo, Parcelling) { 
    ASSERT_EQ(i.packageName, i2.packageName);

    ASSERT_EQ(i.inputFeatures, i2.inputFeatures);

    ASSERT_EQ(i.displayId, i2.displayId);

    ASSERT_EQ(i.portalToDisplayId, i2.portalToDisplayId);

    ASSERT_EQ(i.replaceTouchableRegionWithCrop, i2.replaceTouchableRegionWithCrop);

    ASSERT_EQ(i.touchableRegionCropHandle, i2.touchableRegionCropHandle);

    ASSERT_EQ(i.applicationInfo, i2.applicationInfo);