Merge "Fix the locale of the flags in BinaryDicitonary for tests"

java/src/com/android/inputmethod/latin/DictionaryFactory.java

@@ -145,10 +145,10 @@ public class DictionaryFactory {
      * @return the created dictionary, or null.
      */
     public static Dictionary createDictionaryForTest(Context context, File dictionary,
-            long startOffset, long length, Flag[] flagArray) {
+            long startOffset, long length, Flag[] flagArray, Locale locale) {
         if (dictionary.isFile()) {
             return new BinaryDictionary(context, dictionary.getAbsolutePath(), startOffset, length,
-                    flagArray, null);
+                    flagArray, locale);
         } else {
             Log.e(TAG, "Could not find the file. path=" + dictionary.getAbsolutePath());
             return null;

java/src/com/android/inputmethod/latin/Suggest.java

@@ -112,7 +112,7 @@ public class Suggest implements Dictionary.WordCallback {
             final long startOffset, final long length, final Flag[] flagArray,
             final Locale locale) {
         initSynchronously(context, DictionaryFactory.createDictionaryForTest(context, dictionary,
-                startOffset, length, flagArray), locale);
+                startOffset, length, flagArray, locale), locale);
     }
 
     private void initWhitelistAndAutocorrectAndPool(final Context context, final Locale locale) {