From 80094e39f90801c44cd80ab0f98df505828ea1f3 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 16 Nov 2020 23:08:18 +0000 Subject: Revert^2 "libandroidfw hardening for IncFs" 55ef6167a2c235bd88c7216238b2001b46795b79 Change-Id: I02d4890d181655dfd0a14c188468db512559d27b Merged-In: I02d4890d181655dfd0a14c188468db512559d27b --- libs/androidfw/Idmap.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libs/androidfw/Idmap.cpp') diff --git a/libs/androidfw/Idmap.cpp b/libs/androidfw/Idmap.cpp index 4e03ce5d9584..a61309514143 100644 --- a/libs/androidfw/Idmap.cpp +++ b/libs/androidfw/Idmap.cpp @@ -52,22 +52,22 @@ OverlayStringPool::~OverlayStringPool() { uninit(); } -const char16_t* OverlayStringPool::stringAt(size_t idx, size_t* outLen) const { +base::expected OverlayStringPool::stringAt(size_t idx) const { const size_t offset = dtohl(data_header_->string_pool_index_offset); if (idmap_string_pool_ != nullptr && idx >= ResStringPool::size() && idx >= offset) { - return idmap_string_pool_->stringAt(idx - offset, outLen); + return idmap_string_pool_->stringAt(idx - offset); } - return ResStringPool::stringAt(idx, outLen); + return ResStringPool::stringAt(idx); } -const char* OverlayStringPool::string8At(size_t idx, size_t* outLen) const { +base::expected OverlayStringPool::string8At(size_t idx) const { const size_t offset = dtohl(data_header_->string_pool_index_offset); if (idmap_string_pool_ != nullptr && idx >= ResStringPool::size() && idx >= offset) { - return idmap_string_pool_->string8At(idx - offset, outLen); + return idmap_string_pool_->string8At(idx - offset); } - return ResStringPool::string8At(idx, outLen); + return ResStringPool::string8At(idx); } size_t OverlayStringPool::size() const { -- cgit v1.2.3