Manual revert of flutter#53001 (flutter#53075)

Revert label failed due to conflicts `FlutterFragmentTest.java` was the only file that had merge issues, everything else is the output of `git revert 00e72e9` [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
gmackall · May 28, 2024 · b26e1b0 · b26e1b0
1 parent 1a8cd1b
commit b26e1b0
Show file tree

Hide file tree

Showing 10 changed files with 430 additions and 54 deletions.
diff --git a/DEPS b/DEPS
@@ -785,7 +785,7 @@ deps = {
      'packages': [
        {
         'package': 'flutter/android/embedding_bundle',
-        'version': 'last_updated:2024-05-23T10:01:05-0700'
+        'version': 'last_updated:2023-08-11T11:35:44-0700'
        }
      ],
      'condition': 'download_android_deps',

diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
@@ -353,36 +353,36 @@ android_java_sources = [
 ]
 
 embedding_dependencies_jars = [
-  "//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
-  "//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
-  "//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
-  "//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/activity-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/annotations-13.0.jar",
   "//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
-  "//third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
-  "//third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
-  "//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
-  "//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-1.6.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-1.8.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar",
   "//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
-  "//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
-  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
-  "//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
+  "//third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar",
+  "//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar",
   "//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
-  "//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
-  "//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
+  "//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
   "//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
   "//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
-  "//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
-  "//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
+  "//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
+  "//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
 ]
 
 action("check_imports") {

diff --git a/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java b/shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
@@ -322,7 +322,7 @@ public void itDelegatesOnBackPressedWithSetFrameworkHandlesBack() {
 
     // Calling onBackPressed now will still be handled by Android (the default),
     // until setFrameworkHandlesBack is set to true.
-    activity.getOnBackPressedDispatcher().onBackPressed();
+    activity.onBackPressed();
     verify(mockDelegate, times(0)).onBackPressed();
 
     // Setting setFrameworkHandlesBack to true means the delegate will receive

diff --git a/testing/scenario_app/android/app/build.gradle b/testing/scenario_app/android/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    namespace = "dev.flutter.scenarios"
     lintOptions {
         abortOnError true
         checkAllWarnings true
@@ -17,7 +16,7 @@ android {
         // NewerVersionAvailable and GradleDependency need to be taken care of
         // by a roller rather than as part of CI.
         // The others are irrelevant for a test application.
-        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered', 'ObsoleteLintCustomCheck'
+        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
     }
     buildToolsVersion = '34.0.0'
     compileSdkVersion 34