summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--res/values/buffer_sizes.xml2
-rw-r--r--src/com/google/android/traceur/PerfettoUtils.java4
-rw-r--r--uitests/src/com/android/settings/ui/TraceurAppTests.java4
3 files changed, 4 insertions, 6 deletions
diff --git a/res/values/buffer_sizes.xml b/res/values/buffer_sizes.xml
index 6d3537c..7f33ff4 100644
--- a/res/values/buffer_sizes.xml
+++ b/res/values/buffer_sizes.xml
@@ -7,7 +7,6 @@
<!-- Keep the following two arrays in sync or you will regret it! -->
<string-array name="buffer_size_names">
- <item>@string/four_thousand_kb</item>
<item>@string/eight_thousand_kb</item>
<item>@string/sixteen_thousand_kb</item>
<item>@string/thirtytwo_thousand_kb</item>
@@ -15,7 +14,6 @@
</string-array>
<string-array name="buffer_size_values">
- <item>4096</item>
<item>8192</item>
<item>@string/default_buffer_size</item>
<item>32768</item>
diff --git a/src/com/google/android/traceur/PerfettoUtils.java b/src/com/google/android/traceur/PerfettoUtils.java
index a5132bf..5ec76ac 100644
--- a/src/com/google/android/traceur/PerfettoUtils.java
+++ b/src/com/google/android/traceur/PerfettoUtils.java
@@ -120,8 +120,8 @@ public class PerfettoUtils implements TraceUtils.TraceEngine {
.append(" ftrace_config {\n");
for (String tag : tags) {
- // Tags are expected to be all lowercase letters and underscores.
- String cleanTag = tag.replaceAll("[^a-z_]", "");
+ // Tags are expected to be only letters, numbers, and underscores.
+ String cleanTag = tag.replaceAll("[^a-zA-Z0-9_]", "");
if (!cleanTag.equals(tag)) {
Log.w(TAG, "Attempting to use an invalid tag: " + tag);
}
diff --git a/uitests/src/com/android/settings/ui/TraceurAppTests.java b/uitests/src/com/android/settings/ui/TraceurAppTests.java
index 2393979..18717d4 100644
--- a/uitests/src/com/android/settings/ui/TraceurAppTests.java
+++ b/uitests/src/com/android/settings/ui/TraceurAppTests.java
@@ -97,8 +97,8 @@ public class TraceurAppTests {
assertNotNull("Restore default categories element not found.",
mDevice.wait(Until.findObject(By.text("Restore default categories")),
TIMEOUT));
- assertNotNull("Buffer size element not found.",
- mDevice.wait(Until.findObject(By.text("Buffer size")),
+ assertNotNull("Per-CPU buffer size element not found.",
+ mDevice.wait(Until.findObject(By.text("Per-CPU buffer size")),
TIMEOUT));
assertNotNull("Clear saved traces element not found.",
mDevice.wait(Until.findObject(By.text("Clear saved traces")),