From 02424b62ca2c074f376c1e6cf70d65767a3c562d Mon Sep 17 00:00:00 2001
From: Jason Simmons <jason-simmons@users.noreply.github.com>
Date: Wed, 1 Sep 2021 11:56:01 -0700
Subject: [PATCH] Make the LocalizationPluginTest package declaration match the
 source file path (#28391)

---
 .../android/io/flutter/embedding/engine/FlutterJNI.java      | 2 +-
 shell/platform/android/test/io/flutter/FlutterTestSuite.java | 2 +-
 .../flutter/plugin/localization/LocalizationPluginTest.java  | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
index 5c314d5bd3..3a2d4fcd48 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java
@@ -1071,7 +1071,7 @@ public class FlutterJNI {
   /** Invoked by native to obtain the results of Android's locale resolution algorithm. */
   @SuppressWarnings("unused")
   @VisibleForTesting
-  String[] computePlatformResolvedLocale(@NonNull String[] strings) {
+  public String[] computePlatformResolvedLocale(@NonNull String[] strings) {
     if (localizationPlugin == null) {
       return new String[0];
     }
diff --git a/shell/platform/android/test/io/flutter/FlutterTestSuite.java b/shell/platform/android/test/io/flutter/FlutterTestSuite.java
index 8d5fb3391a..6ffc608444 100644
--- a/shell/platform/android/test/io/flutter/FlutterTestSuite.java
+++ b/shell/platform/android/test/io/flutter/FlutterTestSuite.java
@@ -17,7 +17,6 @@ import io.flutter.embedding.engine.FlutterEngineCacheTest;
 import io.flutter.embedding.engine.FlutterEngineConnectionRegistryTest;
 import io.flutter.embedding.engine.FlutterEngineGroupComponentTest;
 import io.flutter.embedding.engine.FlutterJNITest;
-import io.flutter.embedding.engine.LocalizationPluginTest;
 import io.flutter.embedding.engine.RenderingComponentTest;
 import io.flutter.embedding.engine.dart.DartExecutorTest;
 import io.flutter.embedding.engine.dart.DartMessengerTest;
@@ -39,6 +38,7 @@ import io.flutter.plugin.common.StandardMethodCodecTest;
 import io.flutter.plugin.editing.InputConnectionAdaptorTest;
 import io.flutter.plugin.editing.ListenableEditingStateTest;
 import io.flutter.plugin.editing.TextInputPluginTest;
+import io.flutter.plugin.localization.LocalizationPluginTest;
 import io.flutter.plugin.mouse.MouseCursorPluginTest;
 import io.flutter.plugin.platform.PlatformPluginTest;
 import io.flutter.plugin.platform.PlatformViewsControllerTest;
diff --git a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
index a46c8b4844..68f8efa31f 100644
--- a/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
+++ b/shell/platform/android/test/io/flutter/plugin/localization/LocalizationPluginTest.java
@@ -1,5 +1,4 @@
-// Part of the embedding.engine package to allow access to FlutterJNI methods.
-package io.flutter.embedding.engine;
+package io.flutter.plugin.localization;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.any;
@@ -13,11 +12,11 @@ import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.LocaleList;
 import io.flutter.TestUtils;
+import io.flutter.embedding.engine.FlutterJNI;
 import io.flutter.embedding.engine.dart.DartExecutor;
 import io.flutter.embedding.engine.systemchannels.LocalizationChannel;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
-import io.flutter.plugin.localization.LocalizationPlugin;
 import java.util.Locale;
 import org.json.JSONException;
 import org.json.JSONObject;
-- 
GitLab