| commit | 26609e2c306e7f15c15d047d639889f830f5d1b5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Oct 29 15:28:08 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Tue Oct 29 15:28:08 2013 -0700 |
| tree | d69b1c47a7b0b0247de72d76bd17519770eaa6f3 | |
| parent | 3d0c7797acd4d3973a0a6c0513400f7909df0407 [diff] [blame] |
Re-apply androidfw fixes lost by the directory rearrangement. Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Change-Id: I24e6867284d70a7793d78e62d1a836cbee310fb0
diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp index 6667daf..1f0d530 100644 --- a/libs/androidfw/AssetManager.cpp +++ b/libs/androidfw/AssetManager.cpp
@@ -689,7 +689,7 @@ } } else { ALOGV("loading resource table %s\n", ap.path.string()); - Asset* ass = const_cast<AssetManager*>(this)-> + ass = const_cast<AssetManager*>(this)-> openNonAssetInPathLocked("resources.arsc", Asset::ACCESS_BUFFER, ap);