From 8cb3965a3ebf1c65d03a78fc6c0b84a8adc3024f Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Fri, 19 Oct 2018 15:01:43 -0700 Subject: [PATCH] Properly gate android API < 21 and remove extraneous data array. (#6619) --- .../android/io/flutter/view/FlutterView.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/shell/platform/android/io/flutter/view/FlutterView.java b/shell/platform/android/io/flutter/view/FlutterView.java index f7a8dacac..eadd2247f 100644 --- a/shell/platform/android/io/flutter/view/FlutterView.java +++ b/shell/platform/android/io/flutter/view/FlutterView.java @@ -342,16 +342,8 @@ public class FlutterView extends SurfaceView } // Fallback single locale passing for android API < 24. Should work always. Locale locale = config.locale; - List data = new ArrayList(); - data.add(locale.getLanguage()); - data.add(locale.getCountry()); - if (Build.VERSION.SDK_INT >= 21) { - data.add(locale.getScript()); - } else { - data.add(""); - } - data.add(locale.getVariant()); - mFlutterLocalizationChannel.invokeMethod("setLocale", Arrays.asList(locale.getLanguage(), locale.getCountry(), locale.getScript(), locale.getVariant())); + // getScript() is gated because it is added in API 21. + mFlutterLocalizationChannel.invokeMethod("setLocale", Arrays.asList(locale.getLanguage(), locale.getCountry(), Build.VERSION.SDK_INT >= 21 ? locale.getScript() : "", locale.getVariant())); } -- GitLab