diff options
| author | Romain Guy <romainguy@android.com> | 2009-05-12 22:39:06 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-12 22:39:06 -0700 |
| commit | 15203958fda7d3bf551023b6bcdf9c706e2dba1e (patch) | |
| tree | 6282c8f4cbba3f4e037a7bea50bae0d1799832dd /core/jni/android/graphics | |
| parent | f11e6691d608a457962540ab93a3df8723a37008 (diff) | |
| parent | 2bb3ea162a58c0f1dddccdbe68b64e02456f11f9 (diff) | |
| download | frameworks_base-15203958fda7d3bf551023b6bcdf9c706e2dba1e.zip frameworks_base-15203958fda7d3bf551023b6bcdf9c706e2dba1e.tar.gz frameworks_base-15203958fda7d3bf551023b6bcdf9c706e2dba1e.tar.bz2 | |
am 2bb3ea1: Fix native core runtime. A messy declaration was causing a p
Merge commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9'
* commit '2bb3ea162a58c0f1dddccdbe68b64e02456f11f9':
Fix native core runtime. A messy declaration was causing a problem at boot time.
Diffstat (limited to 'core/jni/android/graphics')
| -rw-r--r-- | core/jni/android/graphics/Typeface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index 4f23f65..21dde63 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -150,7 +150,7 @@ static JNINativeMethod gTypefaceMethods[] = { { "nativeGetStyle", "(I)I", (void*)Typeface_getStyle }, { "nativeCreateFromAsset", "(Landroid/content/res/AssetManager;Ljava/lang/String;)I", (void*)Typeface_createFromAsset }, - { "nativeCreateFromFile", "(Ljava/lang/String)I", + { "nativeCreateFromFile", "(Ljava/lang/String;)I", (void*)Typeface_createFromFile } }; |