diff options
| author | 2014-02-12 01:40:24 -0800 | |
|---|---|---|
| committer | 2014-02-12 01:40:24 -0800 | |
| commit | aa98fb51a8a0148b72e1662cc42102c6547776ce (patch) | |
| tree | 8de2ec13f0465d805977ebfcfdb22c816b1c6274 /libs/androidfw/AssetManager.cpp | |
| parent | 133f6826e58aa7643858d4e50630103eb01f1815 (diff) | |
| parent | f991771f81953f5d355eb905d05a784ed7287016 (diff) | |
am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit 'f991771f81953f5d355eb905d05a784ed7287016':
Use size_t* in AssetManager::createIdmap
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
| -rw-r--r-- | libs/androidfw/AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 05a948dff25a..5069958ee1d2 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp @@ -285,7 +285,7 @@ bool AssetManager::addOverlayPath(const String8& packagePath, int32_t* cookie) } bool AssetManager::createIdmap(const char* targetApkPath, const char* overlayApkPath, - uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, uint32_t* outSize) + uint32_t targetCrc, uint32_t overlayCrc, uint32_t** outData, size_t* outSize) { AutoMutex _l(mLock); const String8 paths[2] = { String8(targetApkPath), String8(overlayApkPath) }; |