summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2015-02-17 15:25:34 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-02-17 15:25:35 +0000
commitbaeb0dfcccc89ae69b5b043f729e22aa2fcd02ea (patch)
treec87c0622d81fbf6d528f981b0f3259953ecf2a88
parenta8451c4c56eccde7992bfc73d6b2a83905265a1a (diff)
parent7f9623f3dc6ec5f548bbade0b497d1f5e7f6db06 (diff)
Merge "Up the history on SignalControllers"
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java2
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
index 8379b939aa31..1d96c6b39499 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/SignalController.java
@@ -36,7 +36,7 @@ public abstract class SignalController<T extends SignalController.State,
// Save the previous SignalController.States of all SignalControllers for dumps.
static final boolean RECORD_HISTORY = true;
// If RECORD_HISTORY how many to save, must be a power of 2.
- static final int HISTORY_SIZE = 16;
+ static final int HISTORY_SIZE = 64;
protected static final boolean DEBUG = NetworkControllerImpl.DEBUG;
protected static final boolean CHATTY = NetworkControllerImpl.CHATTY;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
index 7fa3f68ee729..aefb1bb2b640 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java
@@ -248,6 +248,11 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
}
}
+ public void testHistorySize() {
+ // Verify valid history size, otherwise it gits printed out the wrong order and whatnot.
+ assertEquals(0, SignalController.HISTORY_SIZE & (SignalController.HISTORY_SIZE - 1));
+ }
+
private void setCdma() {
setIsGsm(false);
updateDataConnectionState(TelephonyManager.DATA_CONNECTED,