diff options
| author | 2024-06-05 17:48:49 +0000 | |
|---|---|---|
| committer | 2024-06-05 17:48:49 +0000 | |
| commit | 438d8ad3c4f35c7ff7f9822c4e58b2e27ee5fc23 (patch) | |
| tree | f893959ae82f6acd7e0dfcb60524f96ad92c8967 /libs/androidfw/ZipFileRO.cpp | |
| parent | a09a1338a2f0769d6e5ebd297d60a0a4a40e9977 (diff) | |
| parent | f2be4873ee0095c97f6bfd85a6b90a818898fb25 (diff) | |
Merge changes from topic "unify_getentryinfo" into main am: dc2cfc8a10 am: f2be4873ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3112207
Change-Id: Idd23693fcf2d5aff1be48a029200f5cbbbb7a82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index 839c7b6fef37..10651cdaff33 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -119,14 +119,6 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const * appear to be bogus. */ bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, - uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset, - uint32_t* pModWhen, uint32_t* pCrc32) const -{ - return getEntryInfo(entry, pMethod, pUncompLen, pCompLen, pOffset, pModWhen, - pCrc32, nullptr); -} - -bool ZipFileRO::getEntryInfo(ZipEntryRO entry, uint16_t* pMethod, uint32_t* pUncompLen, uint32_t* pCompLen, off64_t* pOffset, uint32_t* pModWhen, uint32_t* pCrc32, uint16_t* pExtraFieldSize) const { |