Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 24c16b7e: Merge "Frameworks/base: Fix AssetManager JNI"

Browse Source 
* commit '24c16b7e4cdbacedd33347a01ff4944abfc86218':
  Frameworks/base: Fix AssetManager JNI
This commit is contained in:
Adam Lesinski
2014-11-11 19:53:44 +00:00
committed by Android Git Automerger
parent 7b1c33f7a4 24c16b7e4c
commit 044f323e62
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_util_AssetManager.cpp
View File

@@ -2088,7 +2088,7 @@ static JNINativeMethod gAssetManagerMethods[] = {
{ "getAssetAllocations", "()Ljava/lang/String;", { "getAssetAllocations", "()Ljava/lang/String;",
(void*) android_content_AssetManager_getAssetAllocations }, (void*) android_content_AssetManager_getAssetAllocations },
{ "getGlobalAssetManagerCount", "()I", { "getGlobalAssetManagerCount", "()I",
(void*) android_content_AssetManager_getGlobalAssetCount }, (void*) android_content_AssetManager_getGlobalAssetManagerCount },
}; };
int register_android_content_AssetManager(JNIEnv* env) int register_android_content_AssetManager(JNIEnv* env)