Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track libziparchive API change."

Browse Source 
am: 71e79a2396

Change-Id: Ia408edd9d3c0ad497dabccf11073886bb9edf8df
This commit is contained in:
Elliott Hughes
2019-05-09 14:54:13 -07:00
committed by android-build-merger
parent 4c4ac1c2b1 71e79a2396
commit b17db5960e
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/jni/android_util_jar_StrictJarFile.cpp
View File

@@ -100,16 +100,8 @@ jlong StrictJarFile_nativeStartIteration(JNIEnv* env, jobject, jlong nativeHandl
} }
IterationHandle* handle = new IterationHandle(); IterationHandle* handle = new IterationHandle();
int32_t error = 0; int32_t error = StartIteration(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
if (prefixChars.size() == 0) { handle->CookieAddress(), prefixChars.c_str(), "");
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);
}
if (error) { if (error) {
throwIoException(env, error); throwIoException(env, error);
return static_cast<jlong>(-1); return static_cast<jlong>(-1);

3
libs/androidfw/ApkAssets.cpp
View File

@@ -206,9 +206,8 @@ bool ApkAssets::ForEachFile(const std::string& root_path,
root_path_full += '/'; root_path_full += '/';
} }
::ZipString prefix(root_path_full.c_str());
void* cookie; void* cookie;
if (::StartIteration(zip_handle_.get(), &cookie, &prefix, nullptr) != 0) { if (::StartIteration(zip_handle_.get(), &cookie, root_path_full, "") != 0) {
return false; return false;
} }

5
libs/androidfw/ZipFileRO.cpp
View File

@@ -149,11 +149,8 @@ bool ZipFileRO::startIteration(void** cookie) {
bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix) bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
{ {
_ZipEntryRO* ze = new _ZipEntryRO; _ZipEntryRO* ze = new _ZipEntryRO;
ZipString pe(prefix ? prefix : "");
ZipString se(suffix ? suffix : "");
int32_t error = StartIteration(mHandle, &(ze->cookie), int32_t error = StartIteration(mHandle, &(ze->cookie),
prefix ? &pe : NULL, prefix ? prefix : "", suffix ? suffix : "");
suffix ? &se : NULL);
if (error) { if (error) {
ALOGW("Could not start iteration over %s: %s", mFileName != NULL ? mFileName : "<null>", ALOGW("Could not start iteration over %s: %s", mFileName != NULL ? mFileName : "<null>",
ErrorCodeString(error)); ErrorCodeString(error));