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, 4 insertions, 4 deletions

diff --git a/tools/aapt/StringPool.cpp b/tools/aapt/StringPool.cpp
index 6cacd32eb91d..37b61bfdffbd 100644
--- a/tools/aapt/StringPool.cpp
+++ b/tools/aapt/StringPool.cpp
@@ -52,9 +52,9 @@ void printStringPool(const ResStringPool* pool)
     for (size_t i=0; i<N; i++) {
         size_t len;
         if (pool->isUTF8()) {
-            uniqueStrings.add(UnpackOptionalString(pool->string8At(i), &len));
+            uniqueStrings.add(pool->string8At(i, &len));
         } else {
-            uniqueStrings.add(UnpackOptionalString(pool->stringAt(i), &len));
+            uniqueStrings.add(pool->stringAt(i, &len));
         }
     }
 
@@ -66,8 +66,8 @@ void printStringPool(const ResStringPool* pool)
 
     const size_t NS = pool->size();
     for (size_t s=0; s<NS; s++) {
-        auto str = pool->string8ObjectAt(s);
-        printf("String #" ZD ": %s\n", (ZD_TYPE) s, (str.has_value() ? str->string() : ""));
+        String8 str = pool->string8ObjectAt(s);
+        printf("String #" ZD ": %s\n", (ZD_TYPE) s, str.string());
     }
 }