8163979: [macosx] Chinese text shows as Latin w/ openVanilla input method

Reviewed-by: prr, serb

src/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java

 /*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -57,15 +57,19 @@ public class CInputMethodDescriptor implements InputMethodDescriptor {
     }
 
     static Object[] getAvailableLocalesInternal() {
-        List workList = nativeGetAvailableLocales();
-
-        if (workList != null) {
-            return workList.toArray();
-        }
+        List<Object> workList = nativeGetAvailableLocales();
+        Locale currentLocale = CInputMethod.getNativeLocale();
 
+        if (workList == null || workList.isEmpty()) {
             return new Object[] {
-            Locale.getDefault()
+                    currentLocale != null ? currentLocale : Locale.getDefault()
             };
+        } else {
+            if (currentLocale != null && !workList.contains(currentLocale)) {
+                workList.add(currentLocale);
+            }
+            return workList.toArray();
+        }
     }
 
     /**
@@ -119,5 +123,5 @@ public class CInputMethodDescriptor implements InputMethodDescriptor {
     }
 
     private static native void nativeInit();
-    private static native List nativeGetAvailableLocales();
+    private static native List<Object> nativeGetAvailableLocales();
 }