--- old/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java 2019-03-08 15:32:47.000000000 +0900 +++ new/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java 2019-03-08 15:32:46.000000000 +0900 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2019, 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 @@ -510,8 +510,15 @@ public String getDisplayCountry(String countryCode, Locale locale) { // Retrieves the display country name by calling // GetLocaleInfoEx(LOCALE_SLOCALIZEDCOUNTRYNAME). - return getDisplayString(locale.toLanguageTag(), - DN_LOCALE_REGION, nativeDisplayLanguage+"-"+countryCode); + String str = getDisplayString(locale.toLanguageTag(), + DN_LOCALE_REGION, + nativeDisplayLanguage+"-"+countryCode); + // Hack: Windows 10 returns translated "Unknown Region (XX)" + // for localized XX region name. Take that as not known. + if (str != null && str.contains("("+countryCode+")")) { + return null; + } + return str; } @Override