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

Merge "Track libziparchive API change."

Browse Source
This commit is contained in:
Elliott Hughes
2019-05-06 23:45:16 +00:00
committed by Gerrit Code Review
parent bdb61f3cf2 b97e737c18
commit 32581e1dd2
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_util_jar_StrictJarFile.cpp
View File

@@ -146,7 +146,7 @@ jobject StrictJarFile_nativeFindEntry(JNIEnv* env, jobject, jlong nativeHandle,
ZipEntry data; ZipEntry data;
const int32_t error = FindEntry(reinterpret_cast<ZipArchiveHandle>(nativeHandle), const int32_t error = FindEntry(reinterpret_cast<ZipArchiveHandle>(nativeHandle),
ZipString(entryNameChars.c_str()), &data); entryNameChars.c_str(), &data);
if (error) { if (error) {
return NULL; return NULL;
} }

6
libs/androidfw/ApkAssets.cpp
View File

@@ -120,9 +120,8 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadImpl(
std::unique_ptr<ApkAssets> loaded_apk(new ApkAssets(unmanaged_handle, path)); std::unique_ptr<ApkAssets> loaded_apk(new ApkAssets(unmanaged_handle, path));
// Find the resource table. // Find the resource table.
::ZipString entry_name(kResourcesArsc.c_str());
::ZipEntry entry; ::ZipEntry entry;
result = ::FindEntry(loaded_apk->zip_handle_.get(), entry_name, &entry); result = ::FindEntry(loaded_apk->zip_handle_.get(), kResourcesArsc, &entry);
if (result != 0) { if (result != 0) {
// There is no resources.arsc, so create an empty LoadedArsc and return. // There is no resources.arsc, so create an empty LoadedArsc and return.
loaded_apk->loaded_arsc_ = LoadedArsc::CreateEmpty(); loaded_apk->loaded_arsc_ = LoadedArsc::CreateEmpty();
@@ -160,9 +159,8 @@ std::unique_ptr<const ApkAssets> ApkAssets::LoadImpl(
std::unique_ptr<Asset> ApkAssets::Open(const std::string& path, Asset::AccessMode mode) const { std::unique_ptr<Asset> ApkAssets::Open(const std::string& path, Asset::AccessMode mode) const {
CHECK(zip_handle_ != nullptr); CHECK(zip_handle_ != nullptr);
::ZipString name(path.c_str());
::ZipEntry entry; ::ZipEntry entry;
int32_t result = ::FindEntry(zip_handle_.get(), name, &entry); int32_t result = ::FindEntry(zip_handle_.get(), path, &entry);
if (result != 0) { if (result != 0) {
return {}; return {};
} }

2
libs/androidfw/ZipFileRO.cpp
View File

@@ -98,7 +98,7 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const
data->name = ZipString(entryName); data->name = ZipString(entryName);
const int32_t error = FindEntry(mHandle, data->name, &(data->entry)); const int32_t error = FindEntry(mHandle, entryName, &(data->entry));
if (error) { if (error) {
delete data; delete data;
return NULL; return NULL;

3
libs/androidfw/tests/TestHelpers.cpp
View File

@@ -34,9 +34,8 @@ AssertionResult ReadFileFromZipToString(const std::string& zip_path, const std::
<< "': " << ::ErrorCodeString(result); << "': " << ::ErrorCodeString(result);
} }
::ZipString name(file.c_str());
::ZipEntry entry; ::ZipEntry entry;
result = ::FindEntry(handle, name, &entry); result = ::FindEntry(handle, file.c_str(), &entry);
if (result != 0) { if (result != 0) {
::CloseArchive(handle); ::CloseArchive(handle);
return AssertionFailure() << "Could not find file '" << file << "' in zip '" << zip_path return AssertionFailure() << "Could not find file '" << file << "' in zip '" << zip_path