summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarmen Jackson <carmenjackson@google.com>2019-05-20 11:53:53 -0700
committerCarmen Jackson <carmenjackson@google.com>2019-05-21 11:14:45 -0700
commit419380de0708a11a86c9316ce1229df226b457f3 (patch)
tree974b43d2ce2d2d23b353ca4be3495d6f34e0eabf
parentd01ae2de568e0b62892565f05d28a0a29ab5e30a (diff)
downloadandroid_packages_apps_Traceur-419380de0708a11a86c9316ce1229df226b457f3.tar.gz
android_packages_apps_Traceur-419380de0708a11a86c9316ce1229df226b457f3.tar.bz2
android_packages_apps_Traceur-419380de0708a11a86c9316ce1229df226b457f3.zip
Remove lowest buffer size from the list of options.
This buffer may not be big enough to prevent us from losing tracepoints with the file_write_period used by Traceur (which is 2500). Even low-end devices should be fine using a bigger buffer, which is preferable to having a more frequent write period. If a user previously had their buffer size set to 4096, that size will remain their setting upon upgrading Traceur until they change it. Bug: 124016151 Test: atest TraceurUiTests had gotten stale; updated the test Test: manual Merged-In: Ib793bbdf3d0a8a67eeec38c9a9b990721791bea6 Change-Id: Ib793bbdf3d0a8a67eeec38c9a9b990721791bea6
-rw-r--r--res/values/buffer_sizes.xml2
-rw-r--r--uitests/src/com/android/settings/ui/TraceurAppTests.java4
2 files changed, 2 insertions, 4 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/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")),