summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-04-12 14:52:58 -0700
committerDianne Hackborn <hackbod@google.com>2013-04-12 14:53:10 -0700
commitf7be4800df28d7cb6a96003046bf90245e7054ab (patch)
tree398c298946d8f95fef56fe18a52903f68966be8e /core/jni
parent8d4c23b9c32f8c0328ebca538bb801716fe4478a (diff)
downloadframeworks_base-f7be4800df28d7cb6a96003046bf90245e7054ab.zip
frameworks_base-f7be4800df28d7cb6a96003046bf90245e7054ab.tar.gz
frameworks_base-f7be4800df28d7cb6a96003046bf90245e7054ab.tar.bz2
Add new resources trace, also trace apk dex loading.
Change-Id: Ia48566efb21ee018659bd976ddb3a0f4997b9a3a
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_util_AssetManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 785bf13..dc4d945 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -1642,7 +1642,7 @@ static JNINativeMethod gAssetManagerMethods[] = {
(void*) android_content_AssetManager_getAssetLength },
{ "getAssetRemainingLength", "(I)J",
(void*) android_content_AssetManager_getAssetRemainingLength },
- { "addAssetPath", "(Ljava/lang/String;)I",
+ { "addAssetPathNative", "(Ljava/lang/String;)I",
(void*) android_content_AssetManager_addAssetPath },
{ "isUpToDate", "()Z",
(void*) android_content_AssetManager_isUpToDate },