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

Commit 2b6f1b12 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces... 

am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2

* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
parents 7f0d3525 ab6bf752

libs/utils/StreamingZipInflater.cpp

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_NDEBUG 1

//#define LOG_NDEBUG 0

#define LOG_TAG "szipinf"

#include <utils/Log.h>
@@ -77,7 +77,7 @@ StreamingZipInflater::~StreamingZipInflater() { 
}



void StreamingZipInflater::initInflateState() {

    LOGD("Initializing inflate state");

    LOGV("Initializing inflate state");



    memset(&mInflateState, 0, sizeof(mInflateState));

    mInflateState.zalloc = Z_NULL;
@@ -152,13 +152,13 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) { 
            mInflateState.avail_out = mOutBufSize;



            /*

            LOGD("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",

            LOGV("Inflating to outbuf: avail_in=%u avail_out=%u next_in=%p next_out=%p",

                    mInflateState.avail_in, mInflateState.avail_out,

                    mInflateState.next_in, mInflateState.next_out);

            */

            int result = Z_OK;

            if (mStreamNeedsInit) {

                LOGD("Initializing zlib to inflate");

                LOGV("Initializing zlib to inflate");

                result = inflateInit2(&mInflateState, -MAX_WBITS);

                mStreamNeedsInit = false;

            }
@@ -192,7 +192,7 @@ int StreamingZipInflater::readNextChunk() { 
        size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset);

        if (toRead > 0) {

            ssize_t didRead = ::read(mFd, mInBuf, toRead);

            //LOGD("Reading input chunk, size %08x didread %08x", toRead, didRead);

            //LOGV("Reading input chunk, size %08x didread %08x", toRead, didRead);

            if (didRead < 0) {

                // TODO: error

                LOGE("Error reading asset data");