diff options
| author | 2020-11-13 23:55:20 +0000 | |
|---|---|---|
| committer | 2020-11-13 23:55:20 +0000 | |
| commit | 55ef6167a2c235bd88c7216238b2001b46795b79 (patch) | |
| tree | 5a63ff5e6b8a0ade4ce5aa2c4d663d62a7d993d9 /tools/aapt2/ResourceUtils.cpp | |
| parent | 6ca48473e533a8b89abac6294a0bb8130b8c8c89 (diff) | |
Revert "libandroidfw hardening for IncFs"
Revert "Move map_ptr to incfs namspace"
Revert submission 12787270
Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values
Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
Diffstat (limited to 'tools/aapt2/ResourceUtils.cpp')
| -rw-r--r-- | tools/aapt2/ResourceUtils.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/aapt2/ResourceUtils.cpp b/tools/aapt2/ResourceUtils.cpp index 5b43df6f0935..7dfc983b54ba 100644 --- a/tools/aapt2/ResourceUtils.cpp +++ b/tools/aapt2/ResourceUtils.cpp @@ -751,12 +751,10 @@ std::unique_ptr<Item> ParseBinaryResValue(const ResourceType& type, const Config switch (res_value.dataType) { case android::Res_value::TYPE_STRING: { const std::string str = util::GetString(src_pool, data); - auto spans_result = src_pool.styleAt(data); + const android::ResStringPool_span* spans = src_pool.styleAt(data); // Check if the string has a valid style associated with it. - if (spans_result.has_value() && - (*spans_result)->name.index != android::ResStringPool_span::END) { - const android::ResStringPool_span* spans = spans_result->unsafe_ptr(); + if (spans != nullptr && spans->name.index != android::ResStringPool_span::END) { StyleString style_str = {str}; while (spans->name.index != android::ResStringPool_span::END) { style_str.spans.push_back(Span{util::GetString(src_pool, spans->name.index), |