From f3c69499efb4acfa44525fa530e66cea6bc23fcd Mon Sep 17 00:00:00 2001 From: yuanhuihui Date: Mon, 10 Feb 2020 19:42:40 +0800 Subject: [PATCH 1/2] support endless trace buffer --- .../android/io/flutter/app/FlutterActivityDelegate.java | 3 +++ .../io/flutter/embedding/engine/FlutterShellArgs.java | 5 +++++ 2 files changed, 8 insertions(+) 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..8a1c52b4bd97d 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_TRACE_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_TRACE_ENDLESS_TRACE_BUFFER); + } if (intent.getBooleanExtra(ARG_KEY_USE_TEST_FONTS, false)) { args.add(ARG_USE_TEST_FONTS); } From 0359f3759e3cf6e24ffe74b08c537c7c493436b5 Mon Sep 17 00:00:00 2001 From: yuanhuihui Date: Tue, 11 Feb 2020 12:03:09 +0800 Subject: [PATCH 2/2] support trace endless buffer --- .../android/io/flutter/embedding/engine/FlutterShellArgs.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java index 8a1c52b4bd97d..d73c7f7ec6ec8 100644 --- a/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java +++ b/shell/platform/android/io/flutter/embedding/engine/FlutterShellArgs.java @@ -27,7 +27,7 @@ public class FlutterShellArgs { 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_TRACE_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"; @@ -74,7 +74,7 @@ public static FlutterShellArgs fromIntent(@NonNull Intent intent) { args.add(ARG_DISABLE_SERVICE_AUTH_CODES); } if (intent.getBooleanExtra(ARG_KEY_ENDLESS_TRACE_BUFFER, false)) { - args.add(ARG_TRACE_ENDLESS_TRACE_BUFFER); + args.add(ARG_ENDLESS_TRACE_BUFFER); } if (intent.getBooleanExtra(ARG_KEY_USE_TEST_FONTS, false)) { args.add(ARG_USE_TEST_FONTS);