commit e15a5871bdba6aef1febbf14cdd58864a9e905f9
author Yusuke Sato <yusukes@google.com> Thu Aug 06 01:39:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 01:39:44 2015 +0000
tree 9fbc05bcd89d25938512b856fba85e7dc0284bf4
parent 96e2975cbb22ecca4c00bf237ef4027f951a7e73
parent 61234deafe78ded05569edfab24536cdb4bd7720

am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"

* commit '61234deafe78ded05569edfab24536cdb4bd7720':
  Clean up AssetManager::scanAndMergeZipLocked

libs/androidfw/AssetManager.cpp

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 2dc1c96..1c39ffe 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -1545,7 +1545,7 @@
      */
     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 @@
             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;