diff options
Diffstat (limited to 'startop')
| -rw-r--r-- | startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java | 14 | ||||
| -rw-r--r-- | startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java b/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java index 40023878af19..9abbcd71cfd2 100644 --- a/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java +++ b/startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java @@ -70,7 +70,7 @@ public class IorapWorkFlowTest { private static final Duration TIMEOUT = Duration.ofSeconds(300L); private static final String READAHEAD_INDICATOR = - "Description = /data/misc/iorapd/com.android.settings/none/com.android.settings.Settings/compiled_traces/compiled_trace.pb"; + "Description = /data/misc/iorapd/com.android.settings/-?\\d+/com.android.settings.Settings/compiled_traces/compiled_trace.pb"; private UiDevice mDevice; @@ -326,14 +326,14 @@ public class IorapWorkFlowTest { return false; } - String log = executeShellCommand("logcat -s iorapd -d"); + String log = executeShellCommand("logcat -d"); Pattern p = Pattern.compile( - ".*" + READAHEAD_INDICATOR - + ".*Total File Paths=(\\d+) \\(good: (\\d+)%\\)\n" - + ".*Total Entries=(\\d+) \\(good: (\\d+)%\\)\n" - + ".*Total Bytes=(\\d+) \\(good: (\\d+)%\\).*", - Pattern.DOTALL); + ".*" + READAHEAD_INDICATOR + + ".*Total File Paths=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n" + + ".*Total Entries=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n" + + ".*Total Bytes=(\\d+) \\(good: (\\d+[.]?\\d*)%\\).*", + Pattern.DOTALL); Matcher m = p.matcher(log); if (!m.matches()) { diff --git a/startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java b/startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java index 9b3bfcb0fa4a..2055b206dd7a 100644 --- a/startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java +++ b/startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java @@ -40,7 +40,7 @@ public class JobScheduledEvent implements Parcelable { public static final int TYPE_START_JOB = 0; /** JobService#onJobStopped */ public static final int TYPE_STOP_JOB = 1; - private static final int TYPE_MAX = 0; + private static final int TYPE_MAX = 1; /** @hide */ @IntDef(flag = true, prefix = { "TYPE_" }, value = { |