summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/StaticLayout.java
diff options
context:
space:
mode:
authorRoozbeh Pournader <roozbeh@google.com>2015-10-15 00:18:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-15 00:18:36 +0000
commit63aa02e47fa0fdd877b9fde7f1f6eda75b645f92 (patch)
tree8fe641e98c9dc62386a23919cf263794151062f0 /core/java/android/text/StaticLayout.java
parent2eac005bbfc94a774c0a3f870fd393a3e7389f8c (diff)
parent35e026929b10bf05c4c78fce6f05d7569972c5cb (diff)
downloadframeworks_base-63aa02e47fa0fdd877b9fde7f1f6eda75b645f92.zip
frameworks_base-63aa02e47fa0fdd877b9fde7f1f6eda75b645f92.tar.gz
frameworks_base-63aa02e47fa0fdd877b9fde7f1f6eda75b645f92.tar.bz2
Merge "Load binary hyphen data files" into mnc-dr-dev
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
-rw-r--r--core/java/android/text/StaticLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java
index bd1ad79..b0b08db 100644
--- a/core/java/android/text/StaticLayout.java
+++ b/core/java/android/text/StaticLayout.java
@@ -29,6 +29,7 @@ import android.util.Pools.SynchronizedPool;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Locale;
@@ -1244,7 +1245,7 @@ public class StaticLayout extends Layout {
private static native void nFreeBuilder(long nativePtr);
private static native void nFinishBuilder(long nativePtr);
- /* package */ static native long nLoadHyphenator(String patternData);
+ /* package */ static native long nLoadHyphenator(ByteBuffer buf, int offset);
private static native void nSetLocale(long nativePtr, String locale, long nativeHyphenator);