diff options
| author | Yusuke Sato <yusukes@google.com> | 2015-08-05 22:15:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-05 22:15:50 +0000 |
| commit | bd4c482be9c060d92919080c37e0d14fca94d2aa (patch) | |
| tree | 39cb4a16fe433e134af971e61036c0622a593520 /libs/androidfw/AssetManager.cpp | |
| parent | a024acb8bab7e0e04f709fc9f927575f448e11db (diff) | |
| parent | 05f648e1d3cbbe31173d9134cda6056c79d5a4a4 (diff) | |
Merge "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; |