diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-04-12 23:58:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-12 23:58:50 +0000 |
| commit | 15fed390c44972932f6dd7ce3bef1004e8b98b61 (patch) | |
| tree | 25d70c9452c3d2a30e12356a6010b941ce5d7629 /core/jni | |
| parent | efcb252f767ab8737cc41cab4ee155faf2271417 (diff) | |
| parent | f7be4800df28d7cb6a96003046bf90245e7054ab (diff) | |
| download | frameworks_base-15fed390c44972932f6dd7ce3bef1004e8b98b61.zip frameworks_base-15fed390c44972932f6dd7ce3bef1004e8b98b61.tar.gz frameworks_base-15fed390c44972932f6dd7ce3bef1004e8b98b61.tar.bz2 | |
Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev
Diffstat (limited to 'core/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 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 }, |