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

Merge "resolved conflicts for merge of d3d6e9a3 to mnc-dev-plus-aosp" into mnc-dev-plus-aosp

Browse Source
This commit is contained in:
Yusuke Sato
2015-06-29 20:21:02 +00:00
committed by Android (Google) Code Review
parent 1537e1358e 53a19bb967
commit 131b27b7b1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/androidfw/ZipFileRO.cpp
View File

@@ -39,7 +39,7 @@ using namespace android;
class _ZipEntryRO {
public:
ZipEntry entry;
ZipEntryName name;
ZipString name;
void *cookie;
_ZipEntryRO() : cookie(NULL) {}
@@ -80,7 +80,7 @@ ZipEntryRO ZipFileRO::findEntryByName(const char* entryName) const
{
_ZipEntryRO* data = new _ZipEntryRO;
data->name = ZipEntryName(entryName);
data->name = ZipString(entryName);
const int32_t error = FindEntry(mHandle, data->name, &(data->entry));
if (error) {
@@ -133,8 +133,8 @@ bool ZipFileRO::startIteration(void** cookie) {
bool ZipFileRO::startIteration(void** cookie, const char* prefix, const char* suffix)
{
_ZipEntryRO* ze = new _ZipEntryRO;
ZipEntryName pe(prefix ? prefix : "");
ZipEntryName se(suffix ? suffix : "");
ZipString pe(prefix ? prefix : "");
ZipString se(suffix ? suffix : "");
int32_t error = StartIteration(mHandle, &(ze->cookie),
prefix ? &pe : NULL,
suffix ? &se : NULL);