summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-08-11 00:50:56 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-11 00:50:56 -0700
commit7b6d0d99b6904b511996267efae215fe9cb5e98f (patch)
tree85c1f63b5ba66ec77d5c9ecd5a2b44229ed67699 /libs/utils/AssetManager.cpp
parentea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 (diff)
parent679ac09a5c22175354f3a04b28456b323839530e (diff)
am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread
Merge commit '679ac09a5c22175354f3a04b28456b323839530e' * commit '679ac09a5c22175354f3a04b28456b323839530e': More native work.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
-rw-r--r--libs/utils/AssetManager.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/utils/AssetManager.cpp b/libs/utils/AssetManager.cpp
index 60a0d82e255d..e09e755861dc 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.
*