From 082c26ce365affe3ccbccb73e67ddcc9554cb093 Mon Sep 17 00:00:00 2001
From: Zachary Anderson <zanderso@users.noreply.github.com>
Date: Mon, 25 Mar 2024 15:15:24 -0700
Subject: [PATCH] Revert "Disable cleaning up ImageReaders in memory pressure
 callback (#51391)"

This reverts commit cb9dead25ef973143b32debe210ae332c10cc7c6.
---
 .../embedding/engine/renderer/FlutterRenderer.java        | 8 --------
 .../embedding/engine/renderer/FlutterRendererTest.java    | 5 ++---
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
index df0e5b556a0d3..3f920cf126b34 100644
--- a/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
+++ b/shell/platform/android/io/flutter/embedding/engine/renderer/FlutterRenderer.java
@@ -414,11 +414,6 @@ final class ImageReaderSurfaceProducer
     // Flip when debugging to see verbose logs.
     private static final boolean VERBOSE_LOGS = false;
 
-    // If we cleanup the ImageReaders on memory pressure it breaks VirtualDisplay
-    // backed platform views. Disable for now as this is only necessary to work
-    // around a Samsung-specific Android 14 bug.
-    private static final boolean CLEANUP_ON_MEMORY_PRESSURE = false;
-
     private final long id;
 
     private boolean released;
@@ -654,9 +649,6 @@ PerImage dequeueImage() {
 
     @Override
     public void onTrimMemory(int level) {
-      if (!CLEANUP_ON_MEMORY_PRESSURE) {
-        return;
-      }
       cleanup();
       createNewReader = true;
     }
diff --git a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
index bc36ed3075f73..50f83d5fb8e0a 100644
--- a/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
+++ b/shell/platform/android/test/io/flutter/embedding/engine/renderer/FlutterRendererTest.java
@@ -648,12 +648,11 @@ public void ImageReaderSurfaceProducerTrimMemoryCallback() {
     assertEquals(1, texture.numImages());
 
     // Invoke the onTrimMemory callback.
-    // This should do nothing.
     texture.onTrimMemory(0);
     shadowOf(Looper.getMainLooper()).idle();
 
-    assertEquals(1, texture.numImageReaders());
-    assertEquals(1, texture.numImages());
+    assertEquals(0, texture.numImageReaders());
+    assertEquals(0, texture.numImages());
   }
 
   // A 0x0 ImageReader is a runtime error.