summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Pawan Wagh <waghpawan@google.com> 2024-06-03 21:39:07 +0000
committer Pawan Wagh <waghpawan@google.com> 2024-06-04 16:53:44 +0000
commitfbe2bd372f402454489fa831e11359cc657b055c (patch)
tree4ec62ed137881ba399c56e19b7e8e172a85de745 /libs/androidfw/AssetManager.cpp
parent06cb3424492ab182adb2c99be12cfe2509ee004f (diff)
Combine ZipFileRO::getEntryInfo
Removing getEntryInfo which doesn't contain extra field size and fixing the usage. Test: mma libandroidfw Bug: 334109171 Change-Id: Id5c8a5405265e6964f5b56b253430eb7c49cdc02
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
-rw-r--r--libs/androidfw/AssetManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 68befffecf2f..e6182454ad8a 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -926,8 +926,8 @@ Asset* AssetManager::openAssetFromZipLocked(const ZipFileRO* pZipFile,
//printf("USING Zip '%s'\n", pEntry->getFileName());
- if (!pZipFile->getEntryInfo(entry, &method, &uncompressedLen, NULL, NULL,
- NULL, NULL))
+ if (!pZipFile->getEntryInfo(entry, &method, &uncompressedLen, nullptr, nullptr,
+ nullptr, nullptr, nullptr))
{
ALOGW("getEntryInfo failed\n");
return NULL;