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

Merge "Remove FastJNI optimization on AssetManager to avoid dead lock."

Browse Source 
am: 4904e7ae2a

Change-Id: I38169c42b5b5600c0e3d00f0342429b3843f88f8
This commit is contained in:
Tim Zhang
2017-03-01 23:23:24 +00:00
committed by android-build-merger
parent 7719c1ad0d 4904e7ae2a
commit 07acbea653
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/jni/android_util_AssetManager.cpp
View File

@@ -2160,9 +2160,9 @@ static const JNINativeMethod gAssetManagerMethods[] = {
(void*) android_content_AssetManager_readAsset },
{ "seekAsset", "(JJI)J",
(void*) android_content_AssetManager_seekAsset },
{ "getAssetLength", "!(J)J",
{ "getAssetLength", "(J)J",
(void*) android_content_AssetManager_getAssetLength },
{ "getAssetRemainingLength", "!(J)J",
{ "getAssetRemainingLength", "(J)J",
(void*) android_content_AssetManager_getAssetRemainingLength },
{ "addAssetPathNative", "(Ljava/lang/String;Z)I",
(void*) android_content_AssetManager_addAssetPath },
@@ -2178,25 +2178,25 @@ static const JNINativeMethod gAssetManagerMethods[] = {
(void*) android_content_AssetManager_getNonSystemLocales },
{ "getSizeConfigurations", "()[Landroid/content/res/Configuration;",
(void*) android_content_AssetManager_getSizeConfigurations },
{ "setConfiguration", "!(IILjava/lang/String;IIIIIIIIIIIIII)V",
{ "setConfiguration", "(IILjava/lang/String;IIIIIIIIIIIIII)V",
(void*) android_content_AssetManager_setConfiguration },
{ "getResourceIdentifier","!(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I",
{ "getResourceIdentifier","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I",
(void*) android_content_AssetManager_getResourceIdentifier },
{ "getResourceName","!(I)Ljava/lang/String;",
{ "getResourceName","(I)Ljava/lang/String;",
(void*) android_content_AssetManager_getResourceName },
{ "getResourcePackageName","!(I)Ljava/lang/String;",
{ "getResourcePackageName","(I)Ljava/lang/String;",
(void*) android_content_AssetManager_getResourcePackageName },
{ "getResourceTypeName","!(I)Ljava/lang/String;",
{ "getResourceTypeName","(I)Ljava/lang/String;",
(void*) android_content_AssetManager_getResourceTypeName },
{ "getResourceEntryName","!(I)Ljava/lang/String;",
{ "getResourceEntryName","(I)Ljava/lang/String;",
(void*) android_content_AssetManager_getResourceEntryName },
{ "loadResourceValue","!(ISLandroid/util/TypedValue;Z)I",
{ "loadResourceValue","(ISLandroid/util/TypedValue;Z)I",
(void*) android_content_AssetManager_loadResourceValue },
{ "loadResourceBagValue","!(IILandroid/util/TypedValue;Z)I",
{ "loadResourceBagValue","(IILandroid/util/TypedValue;Z)I",
(void*) android_content_AssetManager_loadResourceBagValue },
{ "getStringBlockCount","!()I",
{ "getStringBlockCount","()I",
(void*) android_content_AssetManager_getStringBlockCount },
{ "getNativeStringBlock","!(I)J",
{ "getNativeStringBlock","(I)J",
(void*) android_content_AssetManager_getNativeStringBlock },
{ "getCookieName","(I)Ljava/lang/String;",
(void*) android_content_AssetManager_getCookieName },
@@ -2214,21 +2214,21 @@ static const JNINativeMethod gAssetManagerMethods[] = {
(void*) android_content_AssetManager_copyTheme },
{ "clearTheme", "(J)V",
(void*) android_content_AssetManager_clearTheme },
{ "loadThemeAttributeValue", "!(JILandroid/util/TypedValue;Z)I",
{ "loadThemeAttributeValue", "(JILandroid/util/TypedValue;Z)I",
(void*) android_content_AssetManager_loadThemeAttributeValue },
{ "getThemeChangingConfigurations", "!(J)I",
{ "getThemeChangingConfigurations", "(J)I",
(void*) android_content_AssetManager_getThemeChangingConfigurations },
{ "dumpTheme", "(JILjava/lang/String;Ljava/lang/String;)V",
(void*) android_content_AssetManager_dumpTheme },
{ "applyStyle","!(JIIJ[I[I[I)Z",
{ "applyStyle","(JIIJ[I[I[I)Z",
(void*) android_content_AssetManager_applyStyle },
{ "resolveAttrs","!(JII[I[I[I[I)Z",
{ "resolveAttrs","(JII[I[I[I[I)Z",
(void*) android_content_AssetManager_resolveAttrs },
{ "retrieveAttributes","!(J[I[I[I)Z",
{ "retrieveAttributes","(J[I[I[I)Z",
(void*) android_content_AssetManager_retrieveAttributes },
{ "getArraySize","!(I)I",
{ "getArraySize","(I)I",
(void*) android_content_AssetManager_getArraySize },
{ "retrieveArray","!(I[I)I",
{ "retrieveArray","(I[I)I",
(void*) android_content_AssetManager_retrieveArray },
// XML files.
@@ -2238,11 +2238,11 @@ static const JNINativeMethod gAssetManagerMethods[] = {
// Arrays.
{ "getArrayStringResource","(I)[Ljava/lang/String;",
(void*) android_content_AssetManager_getArrayStringResource },
{ "getArrayStringInfo","!(I)[I",
{ "getArrayStringInfo","(I)[I",
(void*) android_content_AssetManager_getArrayStringInfo },
{ "getArrayIntResource","!(I)[I",
{ "getArrayIntResource","(I)[I",
(void*) android_content_AssetManager_getArrayIntResource },
{ "getStyleAttributes","!(I)[I",
{ "getStyleAttributes","(I)[I",
(void*) android_content_AssetManager_getStyleAttributes },
// Bookkeeping.