diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-12 19:22:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-12 19:22:56 +0000 |
| commit | fc268ecae13f1634054e984a7cc6e325c21f6ab5 (patch) | |
| tree | 0e84e37b0e99fe695c25de0781a425a6975b3055 /libs | |
| parent | 97de064a9a01d2481c47767d7fbb5b7d5482a3aa (diff) | |
| parent | aa98fb51a8a0148b72e1662cc42102c6547776ce (diff) | |
| download | frameworks_base-fc268ecae13f1634054e984a7cc6e325c21f6ab5.zip frameworks_base-fc268ecae13f1634054e984a7cc6e325c21f6ab5.tar.gz frameworks_base-fc268ecae13f1634054e984a7cc6e325c21f6ab5.tar.bz2 | |
am aa98fb51: am f991771f: Merge "Use size_t* in AssetManager::createIdmap"
* commit 'aa98fb51a8a0148b72e1662cc42102c6547776ce':
Use size_t* in AssetManager::createIdmap
Diffstat (limited to 'libs')
| -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 05a948d..5069958 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) }; |