diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2015-08-07 15:13:30 -0700 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2015-10-14 19:10:44 +0000 |
| commit | 0453112de6663e4711f50f1235bca92c39be4041 (patch) | |
| tree | e953b0e9caa4eec8eafaf01906f516858fb7e198 /core/java/android/text/StaticLayout.java | |
| parent | b7e722b88fab8b67f8a2ef54a7acb8c6672b6f46 (diff) | |
| download | frameworks_base-0453112de6663e4711f50f1235bca92c39be4041.zip frameworks_base-0453112de6663e4711f50f1235bca92c39be4041.tar.gz frameworks_base-0453112de6663e4711f50f1235bca92c39be4041.tar.bz2 | |
Make Hyphenator#get() return an object.
Previously, a native pointer was returned. After this change, callers
should call getNativePtr() if they want to get the native pointer instead.
Bug: 21492297
Bug: 24570591
Change-Id: I745bd88e6e8c86078fffb07f90f8d8f24215410c
(cherry picked from commit e7eac6f540b09892172edd5b584605ea90f5a1ba)
Diffstat (limited to 'core/java/android/text/StaticLayout.java')
| -rw-r--r-- | core/java/android/text/StaticLayout.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/text/StaticLayout.java b/core/java/android/text/StaticLayout.java index 3b0def2..bd1ad79 100644 --- a/core/java/android/text/StaticLayout.java +++ b/core/java/android/text/StaticLayout.java @@ -341,7 +341,8 @@ public class StaticLayout extends Layout { private void setLocale(Locale locale) { if (!locale.equals(mLocale)) { - nSetLocale(mNativePtr, locale.toLanguageTag(), Hyphenator.get(locale)); + nSetLocale(mNativePtr, locale.toLanguageTag(), + Hyphenator.get(locale).getNativePtr()); mLocale = locale; } } |