diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-07 15:03:46 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-07 15:14:02 -0800 |
| commit | dc9c109af815100d497184e6dadebceed7f3bf1d (patch) | |
| tree | 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37 /libs/androidfw/StreamingZipInflater.cpp | |
| parent | 9a0aa553ad9f6657cbbf0a182566c481e191e6b7 (diff) | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b (diff) | |
| download | frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.zip frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.gz frameworks_base-dc9c109af815100d497184e6dadebceed7f3bf1d.tar.bz2 | |
resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
Diffstat (limited to 'libs/androidfw/StreamingZipInflater.cpp')
| -rw-r--r-- | libs/androidfw/StreamingZipInflater.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/androidfw/StreamingZipInflater.cpp b/libs/androidfw/StreamingZipInflater.cpp index 1dfec23..b39b5f0 100644 --- a/libs/androidfw/StreamingZipInflater.cpp +++ b/libs/androidfw/StreamingZipInflater.cpp @@ -41,6 +41,8 @@ _rc; }) #endif +static const bool kIsDebug = false; + static inline size_t min_of(size_t a, size_t b) { return (a < b) ? a : b; } using namespace android; @@ -209,7 +211,9 @@ int StreamingZipInflater::readNextChunk() { size_t toRead = min_of(mInBufSize, mInTotalSize - mInNextChunkOffset); if (toRead > 0) { ssize_t didRead = TEMP_FAILURE_RETRY(::read(mFd, mInBuf, toRead)); - //ALOGV("Reading input chunk, size %08x didread %08x", toRead, didRead); + if (kIsDebug) { + ALOGV("Reading input chunk, size %08zx didread %08zx", toRead, didRead); + } if (didRead < 0) { ALOGE("Error reading asset data: %s", strerror(errno)); return didRead; |