commit fbe2bd372f402454489fa831e11359cc657b055c
author Pawan Wagh <waghpawan@google.com> Mon Jun 03 21:39:07 2024 +0000
committer Pawan Wagh <waghpawan@google.com> Tue Jun 04 16:53:44 2024 +0000
tree 4ec62ed137881ba399c56e19b7e8e172a85de745
parent 06cb3424492ab182adb2c99be12cfe2509ee004f

Combine ZipFileRO::getEntryInfo

Removing getEntryInfo which doesn't contain extra field size
and fixing the usage.

Test: mma libandroidfw
Bug: 334109171
Change-Id: Id5c8a5405265e6964f5b56b253430eb7c49cdc02

libs/androidfw/AssetManager.cpp

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 68befff..e618245 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -926,8 +926,8 @@
 
     //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;