diff options
| author | 2019-05-09 14:54:13 -0700 | |
|---|---|---|
| committer | 2019-05-09 14:54:13 -0700 | |
| commit | b17db5960e2073c64ae0980a2221a709a3e7a890 (patch) | |
| tree | 787ec0aadb7bd80071136e7aacc805f59eac27e4 /libs/androidfw/ZipFileRO.cpp | |
| parent | 4c4ac1c2b1f301bd27f1d9abe15936185af2126a (diff) | |
| parent | 71e79a2396a0fa32063ae6e46b866d91b12d6196 (diff) | |
Merge "Track libziparchive API change."
am: 71e79a2396
Change-Id: Ia408edd9d3c0ad497dabccf11073886bb9edf8df
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
| -rw-r--r-- | libs/androidfw/ZipFileRO.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/androidfw/ZipFileRO.cpp b/libs/androidfw/ZipFileRO.cpp index 44614c11fb14..ee5f7783635d 100644 --- a/libs/androidfw/ZipFileRO.cpp +++ b/libs/androidfw/ZipFileRO.cpp @@ -149,11 +149,8 @@ bool ZipFileRO::startIteration(void** cookie) { 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)); |