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
diff --git a/libs/androidfw/tests/TestHelpers.cpp b/libs/androidfw/tests/TestHelpers.cpp
index 10c0a4f..a81bb6f 100644
--- a/libs/androidfw/tests/TestHelpers.cpp
+++ b/libs/androidfw/tests/TestHelpers.cpp
@@ -73,15 +73,11 @@
return AssertionFailure() << "table has no string pool for block " << block;
}
- auto actual_str = pool->string8ObjectAt(val.data);
- if (!actual_str.has_value()) {
- return AssertionFailure() << "could not find string entry";
+ const String8 actual_str = pool->string8ObjectAt(val.data);
+ if (String8(expected_str) != actual_str) {
+ return AssertionFailure() << actual_str.string();
}
-
- if (String8(expected_str) != *actual_str) {
- return AssertionFailure() << actual_str->string();
- }
- return AssertionSuccess() << actual_str->string();
+ return AssertionSuccess() << actual_str.string();
}
} // namespace android