Merge changes from topic "revert-12787270-FYIHXORGZY"

* changes:
  Revert "libandroidfw hardening for IncFs"
  Revert "Cache resolved theme values"
  Revert "Do not cache bag parent stack until requested"

1 files changed, 0 insertions, 23 deletions

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 52e7a70521a1..e77ac3df474c 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -233,29 +233,6 @@ FileMap* ZipFileRO::createEntryFileMap(ZipEntryRO entry) const
 }
 
 /*
- * Create a new incfs::IncFsFileMap object that spans the data in "entry".
- */
-std::optional<incfs::IncFsFileMap> ZipFileRO::createEntryIncFsFileMap(ZipEntryRO entry) const
-{
-    const _ZipEntryRO *zipEntry = reinterpret_cast<_ZipEntryRO*>(entry);
-    const ZipEntry& ze = zipEntry->entry;
-    int fd = GetFileDescriptor(mHandle);
-    size_t actualLen = 0;
-
-    if (ze.method == kCompressStored) {
-        actualLen = ze.uncompressed_length;
-    } else {
-        actualLen = ze.compressed_length;
-    }
-
-    incfs::IncFsFileMap newMap;
-    if (!newMap.Create(fd, ze.offset, actualLen, mFileName)) {
-        return std::nullopt;
-    }
-    return std::move(newMap);
-}
-
-/*
  * Uncompress an entry, in its entirety, into the provided output buffer.
  *
  * This doesn't verify the data's CRC, which might be useful for