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

Commit 81bab808 authored by Chris Forbes's avatar Chris Forbes Committed by android-build-merger
Browse files

Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811... 

Merge "ui: Fix bad size check in Fence::unflatten" into klp-dev am: 25556811 am: 71d3ef13 am: 5c5ee81b
am: 05df3a6f

Change-Id: I50c771aee7375315ba6c6aa4029baacfe9c199d8
parents e7c7be2c 05df3a6f

libs/ui/Fence.cpp

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ nsecs_t Fence::getSignalTime() const { 
}



size_t Fence::getFlattenedSize() const {

    return 1;

    return 4;

}



size_t Fence::getFdCount() const {
@@ -152,7 +152,7 @@ status_t Fence::unflatten(void const*& buffer, size_t& size, int const*& fds, si 
        return INVALID_OPERATION;

    }



    if (size < 1) {

    if (size < getFlattenedSize()) {

        return NO_MEMORY;

    }