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

Commit b25116f7 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Fix allocation count"

parents dff3651e 83ec65e1

libs/binder/Parcel.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -1989,6 +1989,9 @@ status_t Parcel::restartWrite(size_t desired) 
        pthread_mutex_lock(&gParcelGlobalAllocSizeLock);

        pthread_mutex_lock(&gParcelGlobalAllocSizeLock);

        gParcelGlobalAllocSize += desired;

        gParcelGlobalAllocSize += desired;

        gParcelGlobalAllocSize -= mDataCapacity;

        gParcelGlobalAllocSize -= mDataCapacity;

        if (!mData) {

            gParcelGlobalAllocCount++;

        }

        pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);

        pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);

        mData = data;

        mData = data;

        mDataCapacity = desired;

        mDataCapacity = desired;
@@ -2120,7 +2123,6 @@ status_t Parcel::continueWrite(size_t desired) 
                pthread_mutex_lock(&gParcelGlobalAllocSizeLock);

                pthread_mutex_lock(&gParcelGlobalAllocSizeLock);

                gParcelGlobalAllocSize += desired;

                gParcelGlobalAllocSize += desired;

                gParcelGlobalAllocSize -= mDataCapacity;

                gParcelGlobalAllocSize -= mDataCapacity;

                gParcelGlobalAllocCount++;

                pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);

                pthread_mutex_unlock(&gParcelGlobalAllocSizeLock);

                mData = data;

                mData = data;

                mDataCapacity = desired;

                mDataCapacity = desired;