From 92374482d2af5d3e1fa72d83605511153886f964 Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Thu, 19 Oct 2017 18:57:47 -0700 Subject: Rename registerLanguageList to registerLocaleList. The minikin's public method FontStyle::registerLanguageList is now FontStyle::registerLocaleList. Bug: 65024629 Test: make checkbuild Change-Id: Ia42ea8c56972d2f1f9d4429af4b04e7a4eba1a60 --- core/jni/android/graphics/FontFamily.cpp | 4 ++-- core/jni/android/graphics/Paint.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp index c6801bf613fa..9e6985ca300e 100644 --- a/core/jni/android/graphics/FontFamily.cpp +++ b/core/jni/android/graphics/FontFamily.cpp @@ -56,9 +56,9 @@ static jlong FontFamily_initBuilder(JNIEnv* env, jobject clazz, jstring langs, j if (langs != nullptr) { ScopedUtfChars str(env, langs); builder = new NativeFamilyBuilder( - minikin::FontStyle::registerLanguageList(str.c_str()), variant); + minikin::FontStyle::registerLocaleList(str.c_str()), variant); } else { - builder = new NativeFamilyBuilder(minikin::FontStyle::registerLanguageList(""), variant); + builder = new NativeFamilyBuilder(minikin::FontStyle::registerLocaleList(""), variant); } return reinterpret_cast(builder); } diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 93bd16b2d08a..fd62a19f310f 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -544,7 +544,7 @@ namespace PaintGlue { static jint setTextLocales(JNIEnv* env, jobject clazz, jlong objHandle, jstring locales) { Paint* obj = reinterpret_cast(objHandle); ScopedUtfChars localesChars(env, locales); - jint minikinLangListId = minikin::FontStyle::registerLanguageList(localesChars.c_str()); + jint minikinLangListId = minikin::FontStyle::registerLocaleList(localesChars.c_str()); obj->setMinikinLangListId(minikinLangListId); return minikinLangListId; } -- cgit v1.2.3-59-g8ed1b