diff options
| author | 2015-11-07 11:22:24 -0800 | |
|---|---|---|
| committer | 2015-11-07 11:22:24 -0800 | |
| commit | 0d02bd8442f6c062130aa6b9e6be5f87fddf7fb3 (patch) | |
| tree | ba968ff7b9c8333f35aa97935c91e0b88cbdcb6e | |
| parent | 6b92c6e524dbb7598fbeb4aefd98b69e6c13c03a (diff) | |
Removed unused setLocale() method.
The setLocale() method in android.content.res.AssetManager was not
used. Removing it to reduce maintenance cost.
Change-Id: I1b168fe84c2465d1ebc2b62bb965eda885e1220a
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 7 | ||||
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 18 |
2 files changed, 0 insertions, 25 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index 04c690b8334b..7669053cc803 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -686,13 +686,6 @@ public final class AssetManager implements AutoCloseable { public native final boolean isUpToDate(); /** - * Change the locale being used by this asset manager. Not for use by - * applications. - * {@hide} - */ - public native final void setLocale(String locale); - - /** * Get the locales that this asset manager contains data for. * * <p>On SDK 21 (Android 5.0: Lollipop) and above, Locale strings are valid diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 55b7e7ec8325..90606a35b5a2 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -578,22 +578,6 @@ static jboolean android_content_AssetManager_isUpToDate(JNIEnv* env, jobject cla return am->isUpToDate() ? JNI_TRUE : JNI_FALSE; } -static void android_content_AssetManager_setLocale(JNIEnv* env, jobject clazz, - jstring locale) -{ - ScopedUtfChars locale8(env, locale); - if (locale8.c_str() == NULL) { - return; - } - - AssetManager* am = assetManagerForJavaObject(env, clazz); - if (am == NULL) { - return; - } - - am->setLocale(locale8.c_str()); -} - static jobjectArray android_content_AssetManager_getLocales(JNIEnv* env, jobject clazz) { Vector<String8> locales; @@ -2168,8 +2152,6 @@ static const JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_isUpToDate }, // Resources. - { "setLocale", "(Ljava/lang/String;)V", - (void*) android_content_AssetManager_setLocale }, { "getLocales", "()[Ljava/lang/String;", (void*) android_content_AssetManager_getLocales }, { "getSizeConfigurations", "()[Landroid/content/res/Configuration;", |