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 | c6a98bb73d9ba63c8490fd522eb19638e7296834 (patch) | |
| tree | 54b76e53206c2793446cf8721ef56ae37919ca70 /libs | |
| parent | e0435c21567624ebdd9e83e2b835480fe538aea1 (diff) | |
| parent | ef156e6ab6c79c1ef9058c3b8641e71d6cbc29b7 (diff) | |
| download | frameworks_native-c6a98bb73d9ba63c8490fd522eb19638e7296834.zip frameworks_native-c6a98bb73d9ba63c8490fd522eb19638e7296834.tar.gz frameworks_native-c6a98bb73d9ba63c8490fd522eb19638e7296834.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; } |