diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-06-08 20:00:50 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-08 20:00:50 -0700 |
commit | 021408910af170268cb486910d4dd5a7d838c2bb (patch) | |
tree | f5ead23feb93163306ec861fdd5679d4362811d2 /libs/utils | |
parent | 645434fb4eff408698423d70904fb8fc709a5225 (diff) | |
parent | 5fd2169eabd77e6bfafaf456e58051a3bafb2bca (diff) | |
download | frameworks_base-021408910af170268cb486910d4dd5a7d838c2bb.zip frameworks_base-021408910af170268cb486910d4dd5a7d838c2bb.tar.gz frameworks_base-021408910af170268cb486910d4dd5a7d838c2bb.tar.bz2 |
Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
Diffstat (limited to 'libs/utils')
-rw-r--r-- | libs/utils/StreamingZipInflater.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp index 5a162cc..00498bd 100644 --- a/libs/utils/StreamingZipInflater.cpp +++ b/libs/utils/StreamingZipInflater.cpp @@ -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"); |