Protect LanguageRange behind Android O. (flutter#17882)

lzou · Apr 23, 2020 · feb94f6 · feb94f6
1 parent 31ecf87
commit feb94f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/shell/platform/android/io/flutter/embedding/android/FlutterView.java b/shell/platform/android/io/flutter/embedding/android/FlutterView.java
@@ -861,9 +861,9 @@ private void sendLocalesToFlutter(@NonNull Configuration config) {
       locales.add(config.locale);
     }
 
-    List<Locale.LanguageRange> languageRanges = new ArrayList<>();
     Locale platformResolvedLocale = null;
     if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+      List<Locale.LanguageRange> languageRanges = new ArrayList<>();
       LocaleList localeList = config.getLocales();
       int localeCount = localeList.size();
       for (int index = 0; index < localeCount; ++index) {

diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java
@@ -406,9 +406,9 @@ private void sendLocalesToDart(Configuration config) {
       locales.add(config.locale);
     }
 
-    List<Locale.LanguageRange> languageRanges = new ArrayList<>();
     Locale platformResolvedLocale = null;
     if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+      List<Locale.LanguageRange> languageRanges = new ArrayList<>();
       LocaleList localeList = config.getLocales();
       int localeCount = localeList.size();
       for (int index = 0; index < localeCount; ++index) {