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

Merge changes from topic "am-c1e91e5e-2686-4871-b188-107c0ddf3273" into oc-dev

Browse Source 
am: 075bcf73c8

Change-Id: I926986b532e52b423555f9fb6540ccfe50eee075
This commit is contained in:
Ryan Mitchell
2018-06-06 18:30:51 -07:00
committed by android-build-merger
parent ac169beb52 075bcf73c8
commit dff068e1e8
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. // The chunk must be at least the size of the string pool header.
if (size < sizeof(ResStringPool_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); 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), if (validate_chunk(reinterpret_cast<const ResChunk_header*>(data), sizeof(ResStringPool_header),
reinterpret_cast<const uint8_t*>(data) + size, reinterpret_cast<const uint8_t*>(data) + size,
"ResStringPool_header") != NO_ERROR) { "ResStringPool_header") != NO_ERROR) {
LOG_ALWAYS_FATAL("Bad string block: malformed block dimensions"); ALOGW("Bad string block: malformed block dimensions");
return (mError=BAD_TYPE); return (mError=BAD_TYPE);
} }