Revert "Re-enable scenario tests on Android (#33574)" (#33813)

This reverts commit ada245a.

Author: zanderso

.ci.yaml

@@ -100,24 +100,16 @@ targets:
     timeout: 60
 
   - name: Linux Android Emulator Tests
+    bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427
     recipe: engine/scenarios
-    enabled_branches:
-      - main
-      - master
     properties:
       dependencies: >-
         [
-          {"dependency": "android_virtual_device", "version": "31"},
-          {"dependency": "goldctl"}
+          {"dependency": "android_virtual_device", "version": "31"}
         ]
       upload_packages: "true"
       clobber: "true"
     timeout: 60
-    runIf:
-      - DEPS
-      - .ci.yaml
-      - testing/**
-      - shell/platforms/android/**
 
   - name: Linux Benchmarks
     enabled_branches:

shell/platform/android/android_context_gl_unittests.cc

@@ -164,8 +164,7 @@ TEST(AndroidSurfaceGL, CreateSnapshopSurfaceWhenOnscreenSurfaceIsNull) {
   EXPECT_NE(android_surface->GetOnscreenSurface(), nullptr);
 }
 
-// TODO(https://github.com/flutter/flutter/issues/104463): Flaky test.
-TEST(AndroidContextGl, DISABLED_MSAAx4) {
+TEST(AndroidContextGl, MSAAx4) {
   GrMockOptions main_context_options;
   sk_sp<GrDirectContext> main_context =
       GrDirectContext::MakeMock(&main_context_options);

shell/platform/android/external_view_embedder/external_view_embedder.cc

@@ -98,9 +98,6 @@ void AndroidExternalViewEmbedder::SubmitFrame(
 
   for (size_t i = 0; i < current_frame_view_count; i++) {
     int64_t view_id = composition_order_[i];
-    if (picture_recorders_.at(view_id)->getRecordingCanvas() == nullptr) {
-      continue;
-    }
 
     sk_sp<SkPicture> picture =
         picture_recorders_.at(view_id)->finishRecordingAsPicture();

testing/scenario_app/android/app/src/androidTest/java/dev/flutter/scenariosui/ScreenshotUtil.java

@@ -37,10 +37,8 @@ private static class Connection {
     }
 
     synchronized void writeFile(String name, byte[] fileContent) throws IOException {
-      final ByteBuffer buffer = ByteBuffer.allocate(name.length() + fileContent.length + 8);
-      // See ScreenshotBlobTransformer#bind in screenshot_transformer.dart for consumer side.
+      final ByteBuffer buffer = ByteBuffer.allocate(name.length() + fileContent.length + 4);
       buffer.putInt(name.length());
-      buffer.putInt(fileContent.length);
       buffer.put(name.getBytes());
       buffer.put(fileContent);
       final byte[] bytes = buffer.array();
@@ -120,9 +118,6 @@ public static void capture(@NonNull TestableFlutterActivity activity, @NonNull S
 
     final Bitmap bitmap =
         InstrumentationRegistry.getInstrumentation().getUiAutomation().takeScreenshot();
-    if (bitmap == null) {
-      throw new RuntimeException("failed to capture screenshot");
-    }
     final ByteArrayOutputStream out = new ByteArrayOutputStream();
     bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
     ScreenshotUtil.writeFile(captureName, out.toByteArray());

testing/scenario_app/android/app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
+            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.google.intent.action.TEST_LOOP" />
@@ -31,6 +32,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
+            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -43,6 +45,7 @@
             android:hardwareAccelerated="true"
             android:launchMode="singleTop"
             android:windowSoftInputMode="adjustResize"
+            android:theme="@style/FullScreenScreenshot"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/TestActivity.java

@@ -12,12 +12,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.WindowCompat;
-import androidx.core.view.WindowInsetsCompat;
-import androidx.core.view.WindowInsetsControllerCompat;
 import io.flutter.Log;
 import io.flutter.embedding.engine.FlutterShellArgs;
 import io.flutter.embedding.engine.loader.FlutterLoader;
@@ -39,8 +35,6 @@ public abstract class TestActivity extends TestableFlutterActivity {
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    hideSystemBars(getWindow());
-
     final Intent launchIntent = getIntent();
     if ("com.google.intent.action.TEST_LOOP".equals(launchIntent.getAction())) {
       if (Build.VERSION.SDK_INT > 22) {
@@ -164,12 +158,4 @@ public void run() {
           }
         });
   }
-
-  private static void hideSystemBars(Window window) {
-    final WindowInsetsControllerCompat insetController =
-        WindowCompat.getInsetsController(window, window.getDecorView());
-    insetController.setSystemBarsBehavior(
-        WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
-    insetController.hide(WindowInsetsCompat.Type.systemBars());
-  }
 }

testing/scenario_app/android/app/src/main/res/values/styles.xml

@@ -8,4 +8,11 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="FullScreenScreenshot">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+    </style>
+
 </resources>