diff options
| author | 2015-08-05 23:38:47 +0000 | |
|---|---|---|
| committer | 2015-08-05 23:38:47 +0000 | |
| commit | 61234deafe78ded05569edfab24536cdb4bd7720 (patch) | |
| tree | a4690ac2b3ef136e28d14d060eeb62e512f4ce8c /libs/androidfw/AssetManager.cpp | |
| parent | 3383b141c3ac4426279e649ebcee535890203c3f (diff) | |
| parent | bd4c482be9c060d92919080c37e0d14fca94d2aa (diff) | |
am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"
* commit 'bd4c482be9c060d92919080c37e0d14fca94d2aa':
Clean up AssetManager::scanAndMergeZipLocked
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 2dc1c96259c0..1c39ffef6fd4 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -1545,7 +1545,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg */ int dirNameLen = dirName.length(); void *iterationCookie; - if (!pZip->startIteration(&iterationCookie)) { + if (!pZip->startIteration(&iterationCookie, dirName.string(), NULL)) { ALOGW("ZipFileRO::startIteration returned false"); return false; } @@ -1560,9 +1560,7 @@ bool AssetManager::scanAndMergeZipLocked(SortedVector<AssetDir::FileInfo>* pMerg continue; } //printf("Comparing %s in %s?\n", nameBuf, dirName.string()); - if (dirNameLen == 0 || - (strncmp(nameBuf, dirName.string(), dirNameLen) == 0 && - nameBuf[dirNameLen] == '/')) + if (dirNameLen == 0 || nameBuf[dirNameLen] == '/') { const char* cp; const char* nextSlash; |