Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6

Browse Source 
Change-Id: I5c8048d78c4e499419cee8b60e1a591c47b5456b
This commit is contained in:
Android Build Merger (Role)
2018-06-06 15:05:24 +00:00
parent 2263da9539 6714a260e6
commit 3a272fe404
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/androidfw/ResourceTypes.cpp
View File

@@ -459,7 +459,7 @@ status_t ResStringPool::setTo(const void* data, size_t size, bool copyData)
// The chunk must be at least the size of the string pool header.
if (size < sizeof(ResStringPool_header)) {
LOG_ALWAYS_FATAL("Bad string block: data size %zu is too small to be a string block", size);
ALOGW("Bad string block: data size %zu is too small to be a string block", size);
return (mError=BAD_TYPE);
}
@@ -469,7 +469,7 @@ status_t ResStringPool::setTo(const void* data, size_t size, bool copyData)
if (validate_chunk(reinterpret_cast<const ResChunk_header*>(data), sizeof(ResStringPool_header),
reinterpret_cast<const uint8_t*>(data) + size,
"ResStringPool_header") != NO_ERROR) {
LOG_ALWAYS_FATAL("Bad string block: malformed block dimensions");
ALOGW("Bad string block: malformed block dimensions");
return (mError=BAD_TYPE);
}