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

diff --git a/libs/androidfw/tests/ResTable_test.cpp b/libs/androidfw/tests/ResTable_test.cpp
index 9aeb00c47e63..326474e16e5d 100644
--- a/libs/androidfw/tests/ResTable_test.cpp
+++ b/libs/androidfw/tests/ResTable_test.cpp
@@ -442,22 +442,22 @@ TEST(ResTableTest, TruncatedEncodeLength) {
   ASSERT_LT(val.data, pool->size());
 
   // Make sure a string with a truncated length is read to its correct length
-  auto target_str8 = pool->string8At(val.data);
-  ASSERT_TRUE(target_str8.has_value());
-  ASSERT_EQ(size_t(40076), String8(target_str8->data(), target_str8->size()).size());
-  ASSERT_EQ(target_str8->data()[40075], ']');
+  size_t str_len;
+  const char* target_str8 = pool->string8At(val.data, &str_len);
+  ASSERT_TRUE(target_str8 != NULL);
+  ASSERT_EQ(size_t(40076), String8(target_str8, str_len).size());
+  ASSERT_EQ(target_str8[40075], ']');
 
-  auto target_str16 = pool->stringAt(val.data);
-  ASSERT_TRUE(target_str16.has_value());
-  ASSERT_EQ(size_t(40076), String16(target_str16->data(), target_str16->size()).size());
-  ASSERT_EQ(target_str8->data()[40075], (char16_t) ']');
+  const char16_t* target_str16 = pool->stringAt(val.data, &str_len);
+  ASSERT_TRUE(target_str16 != NULL);
+  ASSERT_EQ(size_t(40076), String16(target_str16, str_len).size());
+  ASSERT_EQ(target_str8[40075], (char16_t) ']');
 
   // Load an edited apk with the null terminator removed from the end of the
   // string
   std::string invalid_contents;
-  ASSERT_TRUE(ReadFileFromZipToString(
-      GetTestDataPath() + "/length_decode/length_decode_invalid.apk", "resources.arsc",
-      &invalid_contents));
+  ASSERT_TRUE(ReadFileFromZipToString(GetTestDataPath() + "/length_decode/length_decode_invalid.apk",
+                                      "resources.arsc", &invalid_contents));
   ResTable invalid_table;
   ASSERT_EQ(NO_ERROR, invalid_table.add(invalid_contents.data(), invalid_contents.size()));
 
@@ -472,8 +472,8 @@ TEST(ResTableTest, TruncatedEncodeLength) {
 
   // Make sure a string with a truncated length that is not null terminated errors
   // and does not return the string
-  ASSERT_FALSE(invalid_pool->string8At(invalid_val.data).has_value());
-  ASSERT_FALSE(invalid_pool->stringAt(invalid_val.data).has_value());
+  ASSERT_TRUE(invalid_pool->string8At(invalid_val.data, &str_len) == NULL);
+  ASSERT_TRUE(invalid_pool->stringAt(invalid_val.data, &str_len) == NULL);
 }
 
 }  // namespace android