| Index: content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java
|
| index 8a900022807c6626c5cc8e4395bb39135004c516..4ef58695a1a6b7c46c6bed3fb814eea3aa3ef6c1 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/TracingControllerAndroid.java
|
| @@ -113,15 +113,8 @@ public class TracingControllerAndroid {
|
| /**
|
| * Start profiling to a new file in the Downloads directory.
|
| *
|
| - * Calls #startTracing(String) with a new timestamped filename.
|
| - *
|
| - * @param showToasts Whether or not we want to show toasts during this profiling session.
|
| - * When we are timing the profile run we might not want to incur extra draw overhead of showing
|
| - * notifications about the profiling system.
|
| - * @param categories Which categories to trace. See TracingControllerAndroid::BeginTracing()
|
| - * (in content/public/browser/trace_controller.h) for the format.
|
| - * @param recordContinuously Record until the user ends the trace. The trace buffer is fixed
|
| - * size and we use it as a ring buffer during recording.
|
| + * Calls #startTracing(String, boolean, String, boolean) with a new timestamped filename.
|
| + * @see #startTracing(String, boolean, String, boolean)
|
| */
|
| public boolean startTracing(boolean showToasts, String categories,
|
| boolean recordContinuously) {
|
| @@ -245,7 +238,7 @@ public class TracingControllerAndroid {
|
| if (intent.getAction().endsWith(ACTION_START)) {
|
| String categories = intent.getStringExtra(CATEGORIES_EXTRA);
|
| if (categories == null) {
|
| - categories = "*";
|
| + categories = nativeGetDefaultCategories();
|
| }
|
| boolean recordContinuously =
|
| intent.getStringExtra(RECORD_CONTINUOUSLY_EXTRA) != null;
|
| @@ -269,4 +262,5 @@ public class TracingControllerAndroid {
|
| private native boolean nativeStartTracing(int nativeTracingControllerAndroid, String filename,
|
| String categories, boolean recordContinuously);
|
| private native void nativeStopTracing(int nativeTracingControllerAndroid);
|
| + private native String nativeGetDefaultCategories();
|
| }
|
|
|