Work on issue #4518815: Compatibility mode introduces compatibility regression...
...for Market App iRunner There were a lot of serious issues with how we updated (or often didn't update) the display and resource state when switching compatibility mode in conjunction with restarting and updating application components. This addresses everything I could find. Unfortunately it does *not* fix this particular app. I am starting to think this is just an issue in the app. This change does fix a number of other problems I could repro, such as switching the compatibility mode of an IME. Also a few changes here and there to get rid of $#*&^!! debug logs. Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
This commit is contained in:
parent
59fd67e54b
commit
acf87675ae
@ -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");
|
||||
|
Loading…
Reference in New Issue
Block a user