diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-31 14:13:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-31 14:13:48 +0000 |
| commit | 1cadc07dd1e3711fb1e57548038e3026682c5ef8 (patch) | |
| tree | 5c4ba71ffa68a8094c3849dafa7126d6b6da88f2 /libs/androidfw/AssetManager.cpp | |
| parent | b9f960e094d53440be5c7e8759a74dbb0ab57317 (diff) | |
| parent | 7c4887f66bfa3dad16f8b03dc825ade96d7de130 (diff) | |
| download | frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.zip frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.tar.gz frameworks_base-1cadc07dd1e3711fb1e57548038e3026682c5ef8.tar.bz2 | |
Merge "Change ResourceType cookies to int32_t."
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 52ab361..08328d0 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -335,7 +335,7 @@ bool AssetManager::createIdmapFileLocked(const String8& originalPath, const Stri ALOGW("failed to find resources.arsc in %s\n", ap.path.string()); goto error; } - tables[i].add(ass, (void*)1, false); + tables[i].add(ass, 1, false /* copyData */, NULL /* idMap */); } if (!getZipEntryCrcLocked(originalPath, "resources.arsc", &originalCrc)) { @@ -682,7 +682,7 @@ const ResTable* AssetManager::getResTable(bool required) const // can quickly copy it out for others. ALOGV("Creating shared resources for %s", ap.path.string()); sharedRes = new ResTable(); - sharedRes->add(ass, (void*)(i+1), false, idmap); + sharedRes->add(ass, i + 1, false, idmap); sharedRes = const_cast<AssetManager*>(this)-> mZipSet.setZipResourceTable(ap.path, sharedRes); } @@ -706,7 +706,7 @@ const ResTable* AssetManager::getResTable(bool required) const rt->add(sharedRes); } else { ALOGV("Parsing resources for %s", ap.path.string()); - rt->add(ass, (void*)(i+1), !shared, idmap); + rt->add(ass, i + 1, !shared, idmap); } if (!shared) { |