diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-21 07:39:10 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-21 07:39:10 -0700 |
| commit | 385a753dead6ef15f2e30eae47f73e642b3ef7ed (patch) | |
| tree | ae4e55f4c7903e62f23802c7d49ad97ae5b2f0a7 /libs | |
| parent | a376d030a2075909219926d622b71016418d7dcd (diff) | |
| parent | 368fdba47a49f249aa4346edaf3f45291ca6a7ff (diff) | |
| download | frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.zip frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.gz frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.bz2 | |
resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/utils/StreamingZipInflater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/utils/StreamingZipInflater.cpp b/libs/utils/StreamingZipInflater.cpp index 7ebde78..1f62ac5 100644 --- a/libs/utils/StreamingZipInflater.cpp +++ b/libs/utils/StreamingZipInflater.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#define LOG_NDEBUG 1 #define LOG_TAG "szipinf" #include <utils/Log.h> @@ -157,7 +158,7 @@ ssize_t StreamingZipInflater::read(void* outBuf, size_t count) { */ int result = Z_OK; if (mStreamNeedsInit) { - LOGI("Initializing zlib to inflate"); + LOGD("Initializing zlib to inflate"); result = inflateInit2(&mInflateState, -MAX_WBITS); mStreamNeedsInit = false; } |