diff options
| author | 2014-11-11 19:35:28 +0000 | |
|---|---|---|
| committer | 2014-11-11 19:35:28 +0000 | |
| commit | 24c16b7e4cdbacedd33347a01ff4944abfc86218 (patch) | |
| tree | 3f8005b6d54dee3791f442ec1ce78eaa9907a1da | |
| parent | 71f83672f297b116988defbe989869e5744cda5e (diff) | |
| parent | 328126190b053b0388ddfab778d81cc73dcff81f (diff) | |
Merge "Frameworks/base: Fix AssetManager JNI"
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 4859ee6fb796..e104948543b0 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -2084,7 +2084,7 @@ static JNINativeMethod gAssetManagerMethods[] = { { "getAssetAllocations", "()Ljava/lang/String;", (void*) android_content_AssetManager_getAssetAllocations }, { "getGlobalAssetManagerCount", "()I", - (void*) android_content_AssetManager_getGlobalAssetCount }, + (void*) android_content_AssetManager_getGlobalAssetManagerCount }, }; int register_android_content_AssetManager(JNIEnv* env) |