From f2e7fb8cca8e0a379f5bf8607ad1dcda32ea7bbf Mon Sep 17 00:00:00 2001
From: utzcoz <43091780+utzcoz@users.noreply.github.com>
Date: Fri, 8 Apr 2022 04:11:04 +0800
Subject: [PATCH] Split tests for computePlatformResolvedLocale with N
 (flutter/engine#32385)

---
 .../android/io/flutter/embedding/engine/FlutterJNI.java   | 4 ++--
 .../plugin/localization/LocalizationPluginTest.java       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
index 9c6cc3b3ed0..cbe7a9ceb8c 100644
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
@@ -1212,7 +1212,7 @@ public class FlutterJNI {
       String languageCode = strings[i + 0];
       String countryCode = strings[i + 1];
       String scriptCode = strings[i + 2];
-      // Convert to Locales via LocaleBuilder if available (API 24+) to include scriptCode.
+      // Convert to Locales via LocaleBuilder if available (API 21+) to include scriptCode.
       if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
         Locale.Builder localeBuilder = new Locale.Builder();
         if (!languageCode.isEmpty()) {
@@ -1226,7 +1226,7 @@ public class FlutterJNI {
         }
         supportedLocales.add(localeBuilder.build());
       } else {
-        // Pre-API 24, we fall back on scriptCode-less locales.
+        // Pre-API 21, we fall back on scriptCode-less locales.
         supportedLocales.add(new Locale(languageCode, countryCode));
       }
     }
diff --git a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
index 570e64f82c2..c1a39075bd2 100644
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
@@ -140,8 +140,8 @@ public class LocalizationPluginTest {
 
   // This test should be synced with the version for API 26.
   @Test
-  @Config(sdk = Build.VERSION_CODES.N)
-  public void computePlatformResolvedLocaleAPI24() {
+  @Config(minSdk = Build.VERSION_CODES.N)
+  public void computePlatformResolvedLocale_fromAndroidN() {
     // --- Test Setup ---
     FlutterJNI flutterJNI = new FlutterJNI();
 
@@ -235,8 +235,8 @@ public class LocalizationPluginTest {
 
   // Tests the legacy pre API 24 algorithm.
   @Test
-  @Config(sdk = Build.VERSION_CODES.JELLY_BEAN)
-  public void computePlatformResolvedLocaleAPI16() {
+  @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M)
+  public void computePlatformResolvedLocale_beforeAndroidN() {
     // --- Test Setup ---
     FlutterJNI flutterJNI = new FlutterJNI();