commit 6714a260e60db82058c55a41a1cfd4b3b65fb7ed
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 15:05:12 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Jun 06 15:05:12 2018 +0000
tree 5e03be02543a3c228ed1c22d0444ae3c80845ec6
parent 6a42ea18b3f0ba8d5b865096b303ebf4689629c7
parent 5a632d1b59016714c705a6b929062604fd51d023

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

Change-Id: I0de34641572b18ba701f41df542124b6331537c0

libs/androidfw/ResourceTypes.cpp

diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 9941e46..428180b 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -457,7 +457,7 @@
 
     // 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);
     }
 
@@ -467,7 +467,7 @@
     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);
     }