Locale: Retain compatibility with 4.4 APIs

rmcc · andi34 · commit c78565c7b7b0 · 2016-06-07T21:49:15.000+02:00
Wrap the new methods from change I9b2d7f8d17f970d1b57111dcfe92c16e68b0fa67
in the previous public method.

Fixes libcore.icu.ICUTest#test_localeFromString

Change-Id: Icbffb5d5b55329f29c791b57d019817b5c298431
diff --git a/luni/src/main/java/libcore/icu/ICU.java b/luni/src/main/java/libcore/icu/ICU.java
@@ -166,6 +166,14 @@ private static void parseLangScriptRegionAndVariants(String string,
     }
   }
 
+  /**
+   * The new code from master breaks libcore.icu.ICUTest#test_localeFromString,
+   * which expects the old API. Retain this for 4.4
+   */
+  public static Locale localeFromString(String localeName) {
+      return localeFromIcuLocaleId(localeName);
+  }
+
   /**
    * Returns the appropriate {@code Locale} given a {@code String} of the form returned
    * by {@code toString}. This is very lenient, and doesn't care what's between the underscores:

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,14 @@ private static void parseLangScriptRegionAndVariants(String string,`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
	`169`	`+ /**`
	`170`	`+ * The new code from master breaks libcore.icu.ICUTest#test_localeFromString,`
	`171`	`+ * which expects the old API. Retain this for 4.4`
	`172`	`+ */`
	`173`	`+ public static Locale localeFromString(String localeName) {`
	`174`	`+ return localeFromIcuLocaleId(localeName);`
	`175`	`+ }`
	`176`	`+`
`169`	`177`	`/**`
`170`	`178`	`* Returns the appropriate {@code Locale} given a {@code String} of the form returned`
`171`	`179`	`* by {@code toString}. This is very lenient, and doesn't care what's between the underscores:`