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

1 files changed, 6 insertions, 6 deletions

diff --git a/libs/androidfw/Idmap.cpp b/libs/androidfw/Idmap.cpp
index a61309514143..4e03ce5d9584 100644
--- a/libs/androidfw/Idmap.cpp
+++ b/libs/androidfw/Idmap.cpp
@@ -52,22 +52,22 @@ OverlayStringPool::~OverlayStringPool() {
   uninit();
 }
 
-base::expected<StringPiece16, NullOrIOError> OverlayStringPool::stringAt(size_t idx) const {
+const char16_t* OverlayStringPool::stringAt(size_t idx, size_t* outLen) 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);
+    return idmap_string_pool_->stringAt(idx - offset, outLen);
   }
 
-  return ResStringPool::stringAt(idx);
+  return ResStringPool::stringAt(idx, outLen);
 }
 
-base::expected<StringPiece, NullOrIOError> OverlayStringPool::string8At(size_t idx) const {
+const char* OverlayStringPool::string8At(size_t idx, size_t* outLen) 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);
+    return idmap_string_pool_->string8At(idx - offset, outLen);
   }
 
-  return ResStringPool::string8At(idx);
+  return ResStringPool::string8At(idx, outLen);
 }
 
 size_t OverlayStringPool::size() const {