commit 7a6cc0c006d76953760353c00048c8134c9ba294
author Elliott Hughes <enh@google.com> Wed May 08 12:12:39 2019 -0700
committer Elliott Hughes <enh@google.com> Wed May 08 12:29:25 2019 -0700
tree 24b9044daa8f3a175cb975e4def9d7e04c13050e
parent 5c47b52b93bc84521b8caa9e115ab415ed9f86ac

Track libziparchive API change.

Bug: http://b/129068177
Test: treehugger
Change-Id: Id4b202502b07e08102deda49f7d28ba10a63bb0a

libs/androidfw/ZipFileRO.cpp

diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp
index 44614c1..ee5f778 100644
--- a/libs/androidfw/ZipFileRO.cpp
+++ b/libs/androidfw/ZipFileRO.cpp
@@ -149,11 +149,8 @@
 bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
 {
     _ZipEntryRO* ze = new _ZipEntryRO;
-    ZipString pe(prefix ? prefix : "");
-    ZipString se(suffix ? suffix : "");
     int32_t error = StartIteration(mHandle, &(ze->cookie),
-                                   prefix ? &pe : NULL,
-                                   suffix ? &se : NULL);
+                                   prefix ? prefix : "", suffix ? suffix : "");
     if (error) {
         ALOGW("Could not start iteration over %s: %s", mFileName != NULL ? mFileName : "<null>",
                 ErrorCodeString(error));