src/java.base/share/classes/sun/util/locale/provider/CalendarNameProviderImpl.java

*** 40,51 ****
   *
   * @author Masayoshi Okutsu
   * @author Naoto Sato
   */
  public class CalendarNameProviderImpl extends CalendarNameProvider implements AvailableLanguageTags {
!     private final LocaleProviderAdapter.Type type;
!     private final Set<String> langtags;
  
      public CalendarNameProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) {
          this.type = type;
          this.langtags = langtags;
      }
--- 40,51 ----
   *
   * @author Masayoshi Okutsu
   * @author Naoto Sato
   */
  public class CalendarNameProviderImpl extends CalendarNameProvider implements AvailableLanguageTags {
!     protected final LocaleProviderAdapter.Type type;
!     protected final Set<String> langtags;
  
      public CalendarNameProviderImpl(LocaleProviderAdapter.Type type, Set<String> langtags) {
          this.type = type;
          this.langtags = langtags;
      }
*** 246,261 ****
              }
          }
          if (langtags.contains(locale.toLanguageTag())) {
              return true;
          }
-         if (type == LocaleProviderAdapter.Type.JRE) {
              String oldname = locale.toString().replace('_', '-');
              return langtags.contains(oldname);
          }
-         return false;
-     }
  
      @Override
      public Set<String> getAvailableLanguageTags() {
          return langtags;
      }
--- 246,258 ----