From fbe2bd372f402454489fa831e11359cc657b055c Mon Sep 17 00:00:00 2001
From: Pawan Wagh <waghpawan@google.com>
Date: Mon, 3 Jun 2024 21:39:07 +0000
Subject: 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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libs/androidfw/AssetManager.cpp')

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;
-- 
cgit v1.2.3-59-g8ed1b