src/java.base/share/classes/sun/util/resources/LocaleData.java

rev 49575 : imported patch 8181157

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -273,15 +273,10 @@
                         if (!adapter.isSupportedProviderLocale(itr.next(), langtags)) {
                             itr.remove();
                         }
                     }
                 }
-                // Force fallback to Locale.ENGLISH for CLDR time zone names support
-                if (locale.getLanguage() != "en"
-                        && type == CLDR && category.equals("TimeZoneNames")) {
-                    candidates.add(candidates.size() - 1, Locale.ENGLISH);
-                }
                 CANDIDATES_MAP.putIfAbsent(key, candidates);
             }
             return candidates;
         }