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

Commit 9897b461 authored by Jeff Brown's avatar Jeff Brown
Browse files

resolved conflicts for merge of 2d280f75 to ics-mr1 

Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
parents 1e6a30e6 6d42e13b

libs/binder/CursorWindow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ uint32_t CursorWindow::alloc(size_t size, bool aligned) { 
    uint32_t offset = mHeader->freeOffset + padding;

    uint32_t nextFreeOffset = offset + size;

    if (nextFreeOffset > mSize) {

        LOGE("Window is full: requested allocation %d bytes, "

        LOGW("Window is full: requested allocation %d bytes, "

                "free space %d bytes, window size %d bytes",

                size, freeSpace(), mSize);

        return 0;