diff options
| author | 2024-06-05 16:51:10 +0000 | |
|---|---|---|
| committer | 2024-06-05 16:51:10 +0000 | |
| commit | dc2cfc8a10b8b74ec2c70f3b2d32aa9bf765de87 (patch) | |
| tree | 4f1ce8b407442547c80a9c4d6855764284cbd11f /libs/androidfw/AssetManager.cpp | |
| parent | 5d9d2631d1a6b25b315ffc55670e565e25a3fc9d (diff) | |
| parent | 429a1d5926b2951bc34f41895b1fe6ceb602f8b2 (diff) | |
Merge changes from topic "unify_getentryinfo" into main
* changes:
Fix usage of ZipFileRO::getEntryInfo
Fix usage of ZipFileRO::getEntryInfo
Combine ZipFileRO::getEntryInfo
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 4 |
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; |