From 526a09d73d6f1e8c8e847c6143f839a21131b99a Mon Sep 17 00:00:00 2001
From: "auto-submit[bot]" <flutter-engprod-team@google.com>
Date: Tue, 27 Feb 2024 01:47:55 +0000
Subject: [PATCH] Revert "Migrate Android `scenario_app` to the
 `SurfaceProducer` API (#50993)"

This reverts commit 7e1c44b73c08c6b97e591970cfbd7c03f30b6e5a.
---
 .../ExternalTextureFlutterActivity.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
index 8479673a6ca60..f06f75fcd801b 100644
--- a/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
+++ b/testing/scenario_app/android/app/src/main/java/dev/flutter/scenarios/ExternalTextureFlutterActivity.java
@@ -11,6 +11,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Shader.TileMode;
+import android.graphics.SurfaceTexture;
 import android.hardware.HardwareBuffer;
 import android.media.Image;
 import android.media.ImageReader;
@@ -35,7 +36,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.util.Supplier;
-import io.flutter.view.TextureRegistry;
+import io.flutter.view.TextureRegistry.SurfaceTextureEntry;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Map;
@@ -53,7 +54,7 @@ public class ExternalTextureFlutterActivity extends TestActivity {
   private final CountDownLatch firstFrameLatch = new CountDownLatch(2);
 
   private long textureId = 0;
-  private TextureRegistry.SurfaceProducer surfaceProducer;
+  private SurfaceTextureEntry surfaceTextureEntry;
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -142,18 +143,19 @@ private MediaExtractor createMediaExtractor() {
   public void onPause() {
     surfaceViewRenderer.destroy();
     flutterRenderer.destroy();
-    surfaceProducer.release();
+    surfaceTextureEntry.release();
     super.onPause();
   }
 
   @Override
   public void onFlutterUiDisplayed() {
-    surfaceProducer =
-        Objects.requireNonNull(getFlutterEngine()).getRenderer().createSurfaceProducer();
-    surfaceProducer.setSize(SURFACE_WIDTH, SURFACE_HEIGHT);
-    flutterRenderer.attach(surfaceProducer.getSurface(), firstFrameLatch);
+    surfaceTextureEntry =
+        Objects.requireNonNull(getFlutterEngine()).getRenderer().createSurfaceTexture();
+    SurfaceTexture surfaceTexture = surfaceTextureEntry.surfaceTexture();
+    surfaceTexture.setDefaultBufferSize(SURFACE_WIDTH, SURFACE_HEIGHT);
+    flutterRenderer.attach(new Surface(surfaceTexture), firstFrameLatch);
     flutterRenderer.repaint();
-    textureId = surfaceProducer.id();
+    textureId = surfaceTextureEntry.id();
 
     super.onFlutterUiDisplayed();
   }