commit 55ef6167a2c235bd88c7216238b2001b46795b79
author Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
committer Ryan Mitchell <rtmitchell@google.com> Fri Nov 13 23:55:20 2020 +0000
tree 5a63ff5e6b8a0ade4ce5aa2c4d663d62a7d993d9
parent 6ca48473e533a8b89abac6294a0bb8130b8c8c89

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

cmds/idmap2/libidmap2/ResourceUtils.cpp

diff --git a/cmds/idmap2/libidmap2/ResourceUtils.cpp b/cmds/idmap2/libidmap2/ResourceUtils.cpp
index e817140..98d026b 100644
--- a/cmds/idmap2/libidmap2/ResourceUtils.cpp
+++ b/cmds/idmap2/libidmap2/ResourceUtils.cpp
@@ -72,21 +72,21 @@
 }
 
 Result<std::string> ResToTypeEntryName(const AssetManager2& am, uint32_t resid) {
-  const auto name = am.GetResourceName(resid);
-  if (!name.has_value()) {
+  AssetManager2::ResourceName name;
+  if (!am.GetResourceName(resid, &name)) {
     return Error("no resource 0x%08x in asset manager", resid);
   }
   std::string out;
-  if (name->type != nullptr) {
-    out.append(name->type, name->type_len);
+  if (name.type != nullptr) {
+    out.append(name.type, name.type_len);
   } else {
-    out += Utf16ToUtf8(StringPiece16(name->type16, name->type_len));
+    out += Utf16ToUtf8(StringPiece16(name.type16, name.type_len));
   }
   out.append("/");
-  if (name->entry != nullptr) {
-    out.append(name->entry, name->entry_len);
+  if (name.entry != nullptr) {
+    out.append(name.entry, name.entry_len);
   } else {
-    out += Utf16ToUtf8(StringPiece16(name->entry16, name->entry_len));
+    out += Utf16ToUtf8(StringPiece16(name.entry16, name.entry_len));
   }
   return out;
 }