Skip to content

Remove jre_icu_dynamic. #2375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove jre_icu_dynamic. #2375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions jre_emul/android/platform/libcore/luni/src/objc/java/libcore/icu/ICU.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package libcore.icu;

import android.icu.util.ULocale;
import com.google.j2objc.LibraryNotLinkedError;
import java.lang.reflect.Method;
import java.util.Collections;
Expand Down Expand Up @@ -468,6 +469,7 @@ public static String convertToTzId(String cldrShortTzId) {
if (cldrShortTzId == null) {
return null;
}
/* J2ObjC removed
String tzid = null;
try {
Class<?> ulocaleClass = Class.forName("android.icu.util.ULocale");
Expand All @@ -478,6 +480,11 @@ public static String convertToTzId(String cldrShortTzId) {
} catch (Exception e) {
// Ignore reflection exception and return null below.
}
*/

/* J2ObjC added: reference ULocale explicitly rather than through reflection. */
String tzid = ULocale.toLegacyType("tz", cldrShortTzId);

// ULocale.toLegacyType() returns the lower case of the input ID if it matches the spec, but
// it's not a valid tz id.
if (tzid == null || tzid.equals(cldrShortTzId.toLowerCase(Locale.ROOT))) {
Expand Down