# HG changeset patch
# User jjg
# Date 1313608253 25200
# Node ID 3c12667717a71b104d97998c89bbc8ace97b8869
# Parent  9d3e2b840aa3708d836272eb13e3e489e3569266# Parent  80d9f4bc094b5fb773dce3a2300eb6ddc347f494
Merge

diff -r 9d3e2b840aa3 -r 3c12667717a7 jdk/src/share/classes/java/util/Locale.java
--- a/jdk/src/share/classes/java/util/Locale.java	Wed Aug 17 05:41:20 2011 -0700
+++ b/jdk/src/share/classes/java/util/Locale.java	Wed Aug 17 12:10:53 2011 -0700
@@ -1589,7 +1589,7 @@
      * @since 1.7
      */
     public String getDisplayScript() {
-        return getDisplayScript(getDefault());
+        return getDisplayScript(getDefault(Category.DISPLAY));
     }
 
     /**
diff -r 9d3e2b840aa3 -r 3c12667717a7 jdk/src/windows/native/java/lang/java_props_md.c
--- a/jdk/src/windows/native/java/lang/java_props_md.c	Wed Aug 17 05:41:20 2011 -0700
+++ b/jdk/src/windows/native/java/lang/java_props_md.c	Wed Aug 17 12:10:53 2011 -0700
@@ -563,6 +563,18 @@
         {
             char * display_encoding;
 
+            // Windows UI Language selection list only cares "language"
+            // information of the UI Language. For example, the list
+            // just lists "English" but it actually means "en_US", and
+            // the user cannot select "en_GB" (if exists) in the list.
+            // So, this hack is to use the user LCID region information
+            // for the UI Language, if the "language" portion of those
+            // two locales are the same.
+            if (PRIMARYLANGID(LANGIDFROMLCID(userDefaultLCID)) ==
+                PRIMARYLANGID(LANGIDFROMLCID(userDefaultUILang))) {
+                userDefaultUILang = userDefaultLCID;
+            }
+
             SetupI18nProps(userDefaultUILang,
                            &sprops.language,
                            &sprops.script,
diff -r 9d3e2b840aa3 -r 3c12667717a7 jdk/test/java/util/Locale/LocaleCategory.java
--- a/jdk/test/java/util/Locale/LocaleCategory.java	Wed Aug 17 05:41:20 2011 -0700
+++ b/jdk/test/java/util/Locale/LocaleCategory.java	Wed Aug 17 12:10:53 2011 -0700
@@ -56,6 +56,7 @@
                                   Locale.getDefault().getVariant())).build();
             checkDefault();
             testGetSetDefault();
+            testBug7079486();
         } finally {
             // restore the reserved locale
             Locale.setDefault(reservedLocale);
@@ -82,5 +83,24 @@
             throw new RuntimeException("setDefault() should set all default locales for all categories");
         }
     }
+
+    static void testBug7079486() {
+        Locale zh_Hans_CN = Locale.forLanguageTag("zh-Hans-CN");
+
+        // make sure JRE has zh_Hans_CN localized string
+        if (zh_Hans_CN.getDisplayScript(Locale.US).equals(zh_Hans_CN.getDisplayScript(zh_Hans_CN))) {
+            return;
+        }
+
+        Locale.setDefault(Locale.US);
+        String en_script = zh_Hans_CN.getDisplayScript();
+
+        Locale.setDefault(Locale.Category.DISPLAY, zh_Hans_CN);
+        String zh_script = zh_Hans_CN.getDisplayScript();
+
+        if (en_script.equals(zh_script)) {
+            throw new RuntimeException("Locale.getDisplayScript() (no args) does not honor default DISPLAY locale");
+        }
+    }
 }
 
diff -r 9d3e2b840aa3 -r 3c12667717a7 jdk/test/java/util/Locale/LocaleCategory.sh
--- a/jdk/test/java/util/Locale/LocaleCategory.sh	Wed Aug 17 05:41:20 2011 -0700
+++ b/jdk/test/java/util/Locale/LocaleCategory.sh	Wed Aug 17 12:10:53 2011 -0700
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # @test
-# @bug 4700857 6997928
+# @bug 4700857 6997928 7079486
 # @summary tests for Locale.getDefault(Locale.Category) and 
 #    Locale.setDefault(Locale.Category, Locale)
 # @build LocaleCategory