diff options
| -rw-r--r-- | core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java | 4 | ||||
| -rw-r--r-- | core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java index 718bcb43bd9a..b8dfe0d63a66 100644 --- a/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java +++ b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java @@ -57,14 +57,14 @@ public class KernelCpuThreadReaderSettingsObserver extends ContentObserver { * List of UIDs to report data for */ private static final String COLLECTED_UIDS_SETTINGS_KEY = "collected_uids"; - private static final String COLLECTED_UIDS_DEFAULT = "1000-1000"; + private static final String COLLECTED_UIDS_DEFAULT = "0-0;1000-1000"; /** * Minimum total CPU usage to report */ private static final String MINIMUM_TOTAL_CPU_USAGE_MILLIS_SETTINGS_KEY = "minimum_total_cpu_usage_millis"; - private static final int MINIMUM_TOTAL_CPU_USAGE_MILLIS_DEFAULT = 0; + private static final int MINIMUM_TOTAL_CPU_USAGE_MILLIS_DEFAULT = 10000; private final Context mContext; diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java index 5dddd1afbb60..e6e7a85ae16e 100644 --- a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java +++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java @@ -518,6 +518,17 @@ public class KernelCpuThreadReaderTest { } @Test + public void testUidPredicate_zero() { + KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate = + KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("0-0"); + assertTrue(uidPredicate.test(0)); + assertFalse(uidPredicate.test(1)); + assertFalse(uidPredicate.test(2000)); + assertFalse(uidPredicate.test(10000)); + assertFalse(uidPredicate.test(-100)); + } + + @Test public void testUidPredicate_emptyRangeString() { assertThrows( NumberFormatException.class, |