Reverts "Upgrade Android SDK to 34 "UpsideDownCake"" (flutter/engine#47834)

Reverts flutter/engine#47609 Initiated by: zanderso This change reverts the following previous change: Original Description: ~**This should not land until https://github.com/flutter/buildroot/pull/790 (re)lands, and I swap the buildroot url back to the latest commit.**~ ~Reland of PR to update buildroot at https://github.com/flutter/buildroot/pull/792. ~ <- landed, and changed the buildroot commit to the latest in DEPS Upgrades to android api 34 Also: 1. Upgrades to java 17 in DEPS/ci, because the linter now requires it. 2. Stops running some roboelectric tests on android apis 16-18, because Roboelectric indicated those versions were unsupported and we don't support them either. 3. Applies the four trivial new suggestions from the newer linter. 4. Updates the baseline lint to include the new non-trivial lint ([fixed in a different PR](https://github.com/flutter/engine/pull/47817/files)). 5. Changes some instances where we were hardcoding android apis as numbers (e.g. `sdk = 16') to use version codes (see the [comment below](https://github.com/flutter/engine/pull/47609#issuecomment-1800308658)). [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
2023-11-08 22:57:25 +00:00
parent 5b184b80e9
commit f5605fa8aa
18 changed files with 77 additions and 83 deletions
--- a/6
+++ b/6
@@ -267,7 +267,7 @@ allowed_hosts = [
 ]

 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '44ca359ea6fada2fa1bb007b81994fa4dc8ce2ec',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63',

  'src/flutter/third_party/rapidjson':
   Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
@@ -766,7 +766,7 @@ deps = {
     'packages': [
       {
        'package': 'flutter/android/sdk/all/${{platform}}',
-        'version': 'version:34v3'
+        'version': 'version:33v6'
       }
     ],
     'condition': 'download_android_deps',
@@ -798,7 +798,7 @@ deps = {
     'packages': [
       {
        'package': 'flutter/java/openjdk/${{platform}}',
-        'version': 'version:17'
+        'version': 'version:11'
       }
     ],
     'condition': 'download_android_deps',
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -27,7 +27,7 @@ platform_properties:
      # CIPD flutter/java/openjdk/$platform
      dependencies: >-
        [
-          {"dependency": "open_jdk", "version": "version:17"},
+          {"dependency": "open_jdk", "version": "version:11"},
          {"dependency": "gradle_cache", "version": "none"}
        ]
      device_type: none
@@ -49,7 +49,7 @@ platform_properties:
      # CIPD flutter/java/openjdk/$platform
      dependencies: >-
        [
-          {"dependency": "open_jdk", "version": "version:17"}
+          {"dependency": "open_jdk", "version": "version:11"}
        ]
      device_type: none
      cpu: x86
@@ -76,7 +76,7 @@ platform_properties:
      # CIPD flutter/java/openjdk/$platform
      dependencies: >-
        [
-          {"dependency": "open_jdk", "version": "version:17"}
+          {"dependency": "open_jdk", "version": "version:11"}
        ]
      device_type: none
      os: Windows-10
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java
@@ -233,7 +233,7 @@ public class FlutterView extends FrameLayout
      renderSurface = flutterTextureView;
    } else {
      throw new IllegalArgumentException(
-          "RenderMode not supported with this constructor: " + renderMode);
+          String.format("RenderMode not supported with this constructor: %s", renderMode));
    }

    init();
@@ -327,7 +327,7 @@ public class FlutterView extends FrameLayout
      renderSurface = flutterTextureView;
    } else {
      throw new IllegalArgumentException(
-          "RenderMode not supported with this constructor: " + renderMode);
+          String.format("RenderMode not supported with this constructor: %s", renderMode));
    }

    init();
--- a/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java
@@ -330,17 +330,17 @@ public class PlayStoreDeferredComponentManager implements DeferredComponentManag
                case SplitInstallErrorCode.NETWORK_ERROR:
                  flutterJNI.deferredComponentInstallFailure(
                      loadingUnitId,
-                      "Install of deferred component module \""
-                          + componentName
-                          + "\" failed with a network error",
+                      String.format(
+                          "Install of deferred component module \"%s\" failed with a network error",
+                          componentName),
                      true);
                  break;
                case SplitInstallErrorCode.MODULE_UNAVAILABLE:
                  flutterJNI.deferredComponentInstallFailure(
                      loadingUnitId,
-                      "Install of deferred component module \""
-                          + componentName
-                          + "\" failed as it is unavailable",
+                      String.format(
+                          "Install of deferred component module \"%s\" failed as it is unavailable",
+                          componentName),
                      false);
                  break;
                default:
--- a/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
+++ b/engine/src/flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java
@@ -51,7 +51,7 @@ import java.lang.reflect.Proxy;
 *   EmbeddedView
 */
@Keep
-@TargetApi(Build.VERSION_CODES.KITKAT)
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
 class SingleViewPresentation extends Presentation {
  private static final String TAG = "PlatformViewsController";

--- a/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java
@@ -485,7 +485,7 @@ public class FlutterActivityTest {
  }

  @Test
-  @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.P)
+  @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.P)
  public void fullyDrawn_beforeAndroidQ() {
    Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
    ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
--- 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
@@ -238,7 +238,7 @@ public class LocalizationPluginTest {
  // Tests the legacy pre API 24 algorithm.
  @Test
  @Config(
-      minSdk = Build.VERSION_CODES.KITKAT,
+      minSdk = Build.VERSION_CODES.JELLY_BEAN,
      maxSdk = Build.VERSION_CODES.M,
      qualifiers = "es-rMX")
  public void computePlatformResolvedLocale_emptySupportedLocales_beforeAndroidN() {
@@ -252,7 +252,7 @@ public class LocalizationPluginTest {
  }

  @Test
-  @Config(minSdk = Build.VERSION_CODES.KITKAT, maxSdk = Build.VERSION_CODES.M, qualifiers = "")
+  @Config(minSdk = Build.VERSION_CODES.JELLY_BEAN, maxSdk = Build.VERSION_CODES.M, qualifiers = "")
  public void computePlatformResolvedLocale_selectFirstLocaleWhenNoUserSetting_beforeAndroidN() {
    FlutterJNI flutterJNI = new FlutterJNI();
    DartExecutor dartExecutor = mock(DartExecutor.class);
@@ -273,7 +273,7 @@ public class LocalizationPluginTest {

  @Test
  @Config(
-      minSdk = Build.VERSION_CODES.KITKAT,
+      minSdk = Build.VERSION_CODES.JELLY_BEAN,
      maxSdk = Build.VERSION_CODES.M,
      qualifiers = "fr-rCH")
  public void computePlatformResolvedLocale_selectFirstLocaleWhenNoExactMatch_beforeAndroidN() {
@@ -299,7 +299,7 @@ public class LocalizationPluginTest {

  @Test
  @Config(
-      minSdk = Build.VERSION_CODES.KITKAT,
+      minSdk = Build.VERSION_CODES.JELLY_BEAN,
      maxSdk = Build.VERSION_CODES.M,
      qualifiers = "it-rIT")
  public void computePlatformResolvedLocale_selectExactMatchLocale_beforeAndroidN() {
@@ -325,7 +325,7 @@ public class LocalizationPluginTest {

  @Test
  @Config(
-      minSdk = Build.VERSION_CODES.KITKAT,
+      minSdk = Build.VERSION_CODES.JELLY_BEAN,
      maxSdk = Build.VERSION_CODES.M,
      qualifiers = "fr-rCH")
  public void computePlatformResolvedLocale_selectOnlyLanguageLocale_beforeAndroidN() {
@@ -351,35 +351,35 @@ public class LocalizationPluginTest {
  }

  // Tests the legacy pre API 21 algorithm.
-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void localeFromString_languageOnly() {
    Locale locale = LocalizationPlugin.localeFromString("en");
    assertEquals(locale, new Locale("en"));
  }

-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void localeFromString_languageAndCountry() {
    Locale locale = LocalizationPlugin.localeFromString("en-US");
    assertEquals(locale, new Locale("en", "US"));
  }

-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void localeFromString_languageCountryAndVariant() {
    Locale locale = LocalizationPlugin.localeFromString("zh-Hans-CN");
    assertEquals(locale, new Locale("zh", "CN", "Hans"));
  }

-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void localeFromString_underscore() {
    Locale locale = LocalizationPlugin.localeFromString("zh_Hans_CN");
    assertEquals(locale, new Locale("zh", "CN", "Hans"));
  }

-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void localeFromString_additionalVariantsAreIgnored() {
    Locale locale = LocalizationPlugin.localeFromString("de-DE-u-co-phonebk");
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/PlatformPluginTest.java
@@ -52,7 +52,7 @@ import org.robolectric.shadows.ShadowLooper;
 public class PlatformPluginTest {
  private final Context ctx = ApplicationProvider.getApplicationContext();

-  @Config(sdk = Build.VERSION_CODES.KITKAT)
+  @Config(sdk = 16)
  @Test
  public void itIgnoresNewHapticEventsOnOldAndroidPlatforms() {
    View fakeDecorView = mock(View.class);
@@ -70,7 +70,7 @@ public class PlatformPluginTest {
    platformPlugin.vibrateHapticFeedback(PlatformChannel.HapticFeedbackType.SELECTION_CLICK);
  }

-  @Config(sdk = Build.VERSION_CODES.Q)
+  @Config(sdk = 29)
  @Test
  public void platformPlugin_getClipboardData() throws IOException {
    ClipboardManager clipboardManager = ctx.getSystemService(ClipboardManager.class);
@@ -100,7 +100,7 @@ public class PlatformPluginTest {

  @SuppressWarnings("deprecation")
  // ClipboardManager.getText
-  @Config(sdk = Build.VERSION_CODES.P)
+  @Config(sdk = 28)
  @Test
  public void platformPlugin_hasStrings() {
    ClipboardManager clipboardManager = spy(ctx.getSystemService(ClipboardManager.class));
@@ -154,7 +154,7 @@ public class PlatformPluginTest {
    verify(clipboardManager, never()).getText();
  }

-  @Config(sdk = Build.VERSION_CODES.Q)
+  @Config(sdk = 29)
  @Test
  public void setNavigationBarDividerColor() {
    View fakeDecorView = mock(View.class);
@@ -229,7 +229,7 @@ public class PlatformPluginTest {
    }
  }

-  @Config(sdk = Build.VERSION_CODES.R)
+  @Config(sdk = 30)
  @Test
  public void setNavigationBarIconBrightness() {
    if (Build.VERSION.SDK_INT >= 30) {
@@ -276,7 +276,7 @@ public class PlatformPluginTest {
    }
  }

-  @Config(sdk = Build.VERSION_CODES.R)
+  @Config(sdk = 30)
  @Test
  public void setStatusBarIconBrightness() {
    if (Build.VERSION.SDK_INT >= 30) {
@@ -323,7 +323,7 @@ public class PlatformPluginTest {

  @SuppressWarnings("deprecation")
  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
-  @Config(sdk = Build.VERSION_CODES.Q)
+  @Config(sdk = 29)
  @Test
  public void setSystemUiMode() {
    View fakeDecorView = mock(View.class);
@@ -440,7 +440,7 @@ public class PlatformPluginTest {

  @SuppressWarnings("deprecation")
  // SYSTEM_UI_FLAG_*, setSystemUiVisibility
-  @Config(sdk = Build.VERSION_CODES.P)
+  @Config(sdk = 28)
  @Test
  public void doNotEnableEdgeToEdgeOnOlderSdk() {
    View fakeDecorView = mock(View.class);
@@ -462,7 +462,7 @@ public class PlatformPluginTest {

  @SuppressWarnings("deprecation")
  // FLAG_TRANSLUCENT_STATUS, FLAG_TRANSLUCENT_NAVIGATION
-  @Config(sdk = Build.VERSION_CODES.Q)
+  @Config(sdk = 29)
  @Test
  public void verifyWindowFlagsSetToStyleOverlays() {
    View fakeDecorView = mock(View.class);
--- a/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java
+++ b/engine/src/flutter/shell/platform/android/test/io/flutter/plugin/platform/SingleViewPresentationTest.java
@@ -4,7 +4,7 @@

 package io.flutter.plugin.platform;

-import static android.os.Build.VERSION_CODES.KITKAT;
+import static android.os.Build.VERSION_CODES.JELLY_BEAN_MR1;
 import static android.os.Build.VERSION_CODES.P;
 import static android.os.Build.VERSION_CODES.R;
 import static org.junit.Assert.assertEquals;
@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config;
@TargetApi(P)
 public class SingleViewPresentationTest {
  @Test
-  @Config(minSdk = KITKAT, maxSdk = R)
+  @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
  public void returnsOuterContextInputMethodManager() {
    // There's a bug in Android Q caused by the IMM being instanced per display.
    // https://github.com/flutter/flutter/issues/38375. We need the context returned by
@@ -59,7 +59,7 @@ public class SingleViewPresentationTest {
  }

  @Test
-  @Config(minSdk = KITKAT, maxSdk = R)
+  @Config(minSdk = JELLY_BEAN_MR1, maxSdk = R)
  public void returnsOuterContextInputMethodManager_createDisplayContext() {
    // The IMM should also persist across display contexts created from the base context.

--- a/engine/src/flutter/shell/platform/android/test_runner/build.gradle
+++ b/engine/src/flutter/shell/platform/android/test_runner/build.gradle
@@ -32,10 +32,10 @@ println "AVAILABLE PROCESSORS: $availableProcessors"
 println "=========================================="

 android {
-  compileSdkVersion 34
+  compileSdkVersion 33

  defaultConfig {
-    minSdkVersion 19
+    minSdkVersion 16
  }

  compileOptions {
--- a/engine/src/flutter/testing/android_background_image/android/app/build.gradle
+++ b/engine/src/flutter/testing/android_background_image/android/app/build.gradle
@@ -16,16 +16,16 @@ android {
        // The others are irrelevant for a test application.
        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable'
    }
-    buildToolsVersion = '34.0.0'
-    compileSdkVersion 34
+    buildToolsVersion = '33.0.0'
+    compileSdkVersion 33
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
    }
    defaultConfig {
        applicationId 'dev.flutter.android_background_image'
-        minSdkVersion 19
-        targetSdkVersion 34
+        minSdkVersion 16
+        targetSdkVersion 33
        versionCode 1
        versionName '1.0'
    }
--- a/engine/src/flutter/testing/scenario_app/android/app/build.gradle
+++ b/engine/src/flutter/testing/scenario_app/android/app/build.gradle
@@ -18,16 +18,16 @@ android {
        // The others are irrelevant for a test application.
        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
    }
-    buildToolsVersion = '34.0.0'
-    compileSdkVersion 34
+    buildToolsVersion = '33.0.0'
+    compileSdkVersion 33
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
    }
    defaultConfig {
        applicationId 'dev.flutter.scenarios'
-        minSdkVersion 19
-        targetSdkVersion 34
+        minSdkVersion 18
+        targetSdkVersion 33
        versionCode 1
        versionName '1.0'
        testInstrumentationRunner 'dev.flutter.TestRunner'
--- a/engine/src/flutter/tools/android_lint/baseline.xml
+++ b/engine/src/flutter/tools/android_lint/baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0 [10406996] " type="baseline" client="" dependencies="true" name="" variant="all" version="8.1.0 [10406996] ">
+<issues format="6" by="lint 7.2.0" type="baseline" client="" dependencies="true" name="" variant="all" version="7.2.0">

    <issue
        id="InlinedApi"
@@ -8,7 +8,7 @@
        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="274"
+            line="267"
            column="16"/>
    </issue>

@@ -19,7 +19,7 @@
        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="278"
+            line="271"
            column="16"/>
    </issue>

@@ -30,7 +30,7 @@
        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java"
-            line="282"
+            line="275"
            column="16"/>
    </issue>

@@ -41,7 +41,7 @@
        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
-            line="991"
+            line="661"
            column="25"/>
    </issue>

@@ -52,7 +52,7 @@
        errorLine2="                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
-            line="991"
+            line="661"
            column="67"/>
    </issue>

@@ -67,17 +67,6 @@
            column="82"/>
    </issue>

-    <issue
-        id="Recycle"
-        message="This `AssetFileDescriptor` should be freed up after use with `#close()`"
-        errorLine1="          activity.getContentResolver().openTypedAssetFileDescriptor(item.getUri(), &quot;text/*&quot;, null);"
-        errorLine2="                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java"
-            line="522"
-            column="41"/>
-    </issue>
-
    <issue
        id="ClickableViewAccessibility"
        message="Custom view `FlutterView` overrides `onTouchEvent` but not `performClick`"
@@ -85,7 +74,7 @@
        errorLine2="                 ~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/view/FlutterView.java"
-            line="445"
+            line="436"
            column="18"/>
    </issue>

@@ -96,8 +85,19 @@
        errorLine2="                 ~~~~~~~~~~~~">
        <location
            file="../../../flutter/shell/platform/android/io/flutter/embedding/android/FlutterView.java"
-            line="928"
+            line="911"
            column="18"/>
    </issue>

+    <issue
+        id="UseSparseArrays"
+        message="Use `new SparseArray&lt;VirtualDisplayController>(...)` instead for better performance"
+        errorLine1="        vdControllers = new HashMap&lt;>();"
+        errorLine2="                        ~~~~~~~~~~~~~~~">
+        <location
+            file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java"
+            line="61"
+            column="25"/>
+</issue>
+
 </issues>
--- a/engine/src/flutter/tools/android_lint/bin/main.dart
+++ b/engine/src/flutter/tools/android_lint/bin/main.dart
@@ -73,7 +73,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async {
 <!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
 <project>
  <sdk dir="${androidSdkDir.path}" />
-  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
+  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T">
  <manifest file="${path.join(androidDir.path, 'AndroidManifest.xml')}" />
 ''');
  for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) {
@@ -95,7 +95,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async {
  final List<String> lintArgs = <String>[
    path.join(androidSdkDir.path, 'cmdline-tools', 'latest', 'bin', 'lint'),
    '--project', projectXmlPath,
-    '--compile-sdk-version', '34',
+    '--compile-sdk-version', '33',
    '--showall',
    '--exitcode', // Set non-zero exit code on errors
    '-Wall',
--- a/engine/src/flutter/tools/android_lint/project.xml
+++ b/engine/src/flutter/tools/android_lint/project.xml
@@ -2,7 +2,7 @@
 <!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE       -->
 <project>
  <sdk dir="../../../third_party/android_tools/sdk" />
-  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
+  <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T">
  <manifest file="../../../flutter/shell/platform/android/AndroidManifest.xml" />
    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
    <src file="../../../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
@@ -53,7 +53,6 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/renderer/SurfaceTextureWrapper.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorsStack.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/mutatorsstack/FlutterMutatorView.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/PluginRegistry.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/util/GeneratedPluginRegister.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/plugins/activity/ActivityPluginBinding.java" />
@@ -85,7 +84,6 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/FlutterApplicationInfo.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/loader/ResourceExtractor.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SettingsChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/ProcessTextChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformViewsChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/NavigationChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/LocalizationChannel.java" />
@@ -95,7 +93,6 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyEventChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SpellCheckChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/PlatformChannel.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/KeyboardChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/SystemChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/DeferredComponentChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/systemchannels/MouseCursorChannel.java" />
@@ -105,9 +102,7 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/DeferredComponentManager.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/deferredcomponents/PlayStoreDeferredComponentManager.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroup.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SurfaceTexturePlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRenderTarget.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/ImageReaderPlatformViewRenderTarget.java" />
+    <src file="../../../flutter/shell/platform/android/io/flutter/embedding/engine/FlutterEngineGroupCache.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsController.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewRegistry.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/VirtualDisplayController.java" />
@@ -115,11 +110,11 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/SingleViewPresentation.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewFactory.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/AccessibilityEventsDelegate.java" />
+    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformView.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewsAccessibilityDelegate.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformViewWrapper.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/platform/PlatformOverlayView.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/mouse/MouseCursorPlugin.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/BasicMessageChannel.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/common/JSONMethodCodec.java" />
@@ -146,7 +141,6 @@
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/FlutterTextUtils.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/ImeSyncDeferringInsetsCallback.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/editing/SpellCheckPlugin.java" />
-    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/text/ProcessTextPlugin.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/plugin/localization/LocalizationPlugin.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/FlutterInjector.java" />
    <src file="../../../flutter/shell/platform/android/io/flutter/Log.java" />
--- a/engine/src/flutter/tools/android_sdk/packages.txt
+++ b/engine/src/flutter/tools/android_sdk/packages.txt
@@ -1,6 +1,6 @@
-platforms;android-34:platforms
+platforms;android-33:platforms
 cmdline-tools;latest:cmdline-tools
-build-tools;34.0.0:build-tools
+build-tools;33.0.0:build-tools
 platform-tools:platform-tools
 tools:tools
-ndk;22.1.7171670:ndk
+ndk;22.1.7171670:ndk
--- a/engine/src/flutter/tools/cipd/android_embedding_bundle/build.gradle
+++ b/engine/src/flutter/tools/cipd/android_embedding_bundle/build.gradle
@@ -33,7 +33,7 @@ allprojects {
 apply plugin: "com.android.application"

 android {
-  compileSdkVersion 34
+  compileSdkVersion 33
 }

 configurations {
--- a/engine/src/flutter/tools/javadoc/gen_javadoc.py
+++ b/engine/src/flutter/tools/javadoc/gen_javadoc.py
@@ -58,7 +58,7 @@ def main():
  classpath = [
      args.android_source_root,
      os.path.join(
-          args.third_party, 'android_tools/sdk/platforms/android-34/android.jar'
+          args.third_party, 'android_tools/sdk/platforms/android-33/android.jar'
      ),
      os.path.join(
          args.third_party, 'android_embedding_dependencies', 'lib', '*'