commit 5eafdedceec58a3289d961ba10aa202d81706721
author Elliott Hughes <enh@google.com> Thu May 09 19:29:46 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 09 19:29:46 2019 -0700
tree 266406f4d92ed98fb75befa6d77c25071321bffa
parent 17e4f27e95f30f9522432b1c6c9b74eefbec359a
parent e94bde383b8fde8ddeb5bfbc7698da6010c71815

Merge "Track libziparchive API change." am: 71e79a2396 am: b17db5960e
am: e94bde383b

Change-Id: Iaedfed6f3ef297f58ddde1ee6eb8ecf4e776af5e

core/jni/android_util_jar_StrictJarFile.cpp

diff --git a/core/jni/android_util_jar_StrictJarFile.cpp b/core/jni/android_util_jar_StrictJarFile.cpp
index a26707e..e33da91 100644
--- a/core/jni/android_util_jar_StrictJarFile.cpp
+++ b/core/jni/android_util_jar_StrictJarFile.cpp
@@ -100,16 +100,8 @@
   }
 
   IterationHandle* handle = new IterationHandle();
-  int32_t error = 0;
-  if (prefixChars.size() == 0) {
-    error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
-                           handle->CookieAddress(), NULL, NULL);
-  } else {
-    ZipString entry_name(prefixChars.c_str());
-    error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
-                           handle->CookieAddress(), &entry_name, NULL);
-  }
-
+  int32_t error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
+                                 handle->CookieAddress(), prefixChars.c_str(), "");
   if (error) {
     throwIoException(env, error);
     return static_cast<jlong>(-1);

libs/androidfw/ApkAssets.cpp

diff --git a/libs/androidfw/ApkAssets.cpp b/libs/androidfw/ApkAssets.cpp
index fc3fee7..61e3230 100644
--- a/libs/androidfw/ApkAssets.cpp
+++ b/libs/androidfw/ApkAssets.cpp
@@ -211,9 +211,8 @@
     root_path_full += '/';
   }
 
-  ::ZipString prefix(root_path_full.c_str());
   void* cookie;
-  if (::StartIteration(zip_handle_.get(), &cookie, &prefix, nullptr) != 0) {
+  if (::StartIteration(zip_handle_.get(), &cookie, root_path_full, "") != 0) {
     return false;
   }
 

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));