diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 00:47:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 00:47:51 -0700 |
| commit | 679ac09a5c22175354f3a04b28456b323839530e (patch) | |
| tree | 34b8b48aa74ab56a9dbbb75a6acd792c8bbdfda0 /libs/utils/AssetManager.cpp | |
| parent | 0a6db9bebbd58c6a7e2ad2070d2649a2be57a09a (diff) | |
| parent | a5ae50cd838b5725c63ed485292aae4edd1a98cb (diff) | |
| download | frameworks_base-679ac09a5c22175354f3a04b28456b323839530e.zip frameworks_base-679ac09a5c22175354f3a04b28456b323839530e.tar.gz frameworks_base-679ac09a5c22175354f3a04b28456b323839530e.tar.bz2 | |
am a5ae50cd: Merge "More native work." into gingerbread
Merge commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb' into gingerbread-plus-aosp
* commit 'a5ae50cd838b5725c63ed485292aae4edd1a98cb':
More native work.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
| -rw-r--r-- | libs/utils/AssetManager.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp index 60a0d82..e09e755 100644 --- a/libs/utils/AssetManager.cpp +++ b/libs/utils/AssetManager.cpp @@ -232,6 +232,12 @@ void AssetManager::setConfiguration(const ResTable_config& config, const char* l } } +void AssetManager::getConfiguration(ResTable_config* outConfig) const +{ + AutoMutex _l(mLock); + *outConfig = *mConfig; +} + /* * Open an asset. * |