diff --git a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
index 7d50e16de0b34..3bd9d9a25f24a 100644
--- a/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
+++ b/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
@@ -317,6 +317,9 @@ private static String[] getArgsFromIntent(Intent intent) {
     if (intent.getBooleanExtra("disable-service-auth-codes", false)) {
       args.add("--disable-service-auth-codes");
     }
+    if (intent.getBooleanExtra("endless-trace-buffer", false)) {
+      args.add("--endless-trace-buffer");
+    }
     // NOTE: all flags provided with this argument are subject to filtering
     // based on a whitelist in shell/common/switches.cc. If any flag provided
     // is not present in the whitelist, the process will immediately
diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
index 6e671a2fdab44..d73c7f7ec6ec8 100644
--- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
+++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java
@@ -26,6 +26,8 @@ public class FlutterShellArgs {
   public static final String ARG_START_PAUSED = "--start-paused";
   public static final String ARG_KEY_DISABLE_SERVICE_AUTH_CODES = "disable-service-auth-codes";
   public static final String ARG_DISABLE_SERVICE_AUTH_CODES = "--disable-service-auth-codes";
+  public static final String ARG_KEY_ENDLESS_TRACE_BUFFER = "endless-trace-buffer";
+  public static final String ARG_ENDLESS_TRACE_BUFFER = "--endless-trace-buffer";
   public static final String ARG_KEY_USE_TEST_FONTS = "use-test-fonts";
   public static final String ARG_USE_TEST_FONTS = "--use-test-fonts";
   public static final String ARG_KEY_ENABLE_DART_PROFILING = "enable-dart-profiling";
@@ -71,6 +73,9 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) {
     if (intent.getBooleanExtra(ARG_KEY_DISABLE_SERVICE_AUTH_CODES, false)) {
       args.add(ARG_DISABLE_SERVICE_AUTH_CODES);
     }
+    if (intent.getBooleanExtra(ARG_KEY_ENDLESS_TRACE_BUFFER, false)) {
+      args.add(ARG_ENDLESS_TRACE_BUFFER);
+    }
     if (intent.getBooleanExtra(ARG_KEY_USE_TEST_FONTS, false)) {
       args.add(ARG_USE_TEST_FONTS);
     }