Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "iorap-snap" into rvc-dev

Browse Source 
* changes:
  iorap: Increase the JobScheduledEvent#TYPE_MAX to 1.
  startop: Fix a bug in iorap functional test.
This commit is contained in:
TreeHugger Robot
2020-02-28 20:14:01 +00:00
committed by Android (Google) Code Review
parent e45165523b be178769ad
commit b4c187f5ce
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java
View File

@@ -70,7 +70,7 @@ public class IorapWorkFlowTest {
private static final Duration TIMEOUT = Duration.ofSeconds(300L); private static final Duration TIMEOUT = Duration.ofSeconds(300L);
private static final String READAHEAD_INDICATOR = 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; private UiDevice mDevice;
@@ -326,14 +326,14 @@ public class IorapWorkFlowTest {
return false; return false;
} }
String log = executeShellCommand("logcat -s iorapd -d"); String log = executeShellCommand("logcat -d");
Pattern p = Pattern.compile( Pattern p = Pattern.compile(
".*" + READAHEAD_INDICATOR ".*" + READAHEAD_INDICATOR
+ ".*Total File Paths=(\\d+) \\(good: (\\d+)%\\)\n" + ".*Total File Paths=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n"
+ ".*Total Entries=(\\d+) \\(good: (\\d+)%\\)\n" + ".*Total Entries=(\\d+) \\(good: (\\d+[.]?\\d*)%\\)\n"
+ ".*Total Bytes=(\\d+) \\(good: (\\d+)%\\).*", + ".*Total Bytes=(\\d+) \\(good: (\\d+[.]?\\d*)%\\).*",
Pattern.DOTALL); Pattern.DOTALL);
Matcher m = p.matcher(log); Matcher m = p.matcher(log);
if (!m.matches()) { if (!m.matches()) {

2
startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java
View File

@@ -40,7 +40,7 @@ public class JobScheduledEvent implements Parcelable {
public static final int TYPE_START_JOB = 0; public static final int TYPE_START_JOB = 0;
/** JobService#onJobStopped */ /** JobService#onJobStopped */
public static final int TYPE_STOP_JOB = 1; public static final int TYPE_STOP_JOB = 1;
private static final int TYPE_MAX = 0; private static final int TYPE_MAX = 1;
/** @hide */ /** @hide */
@IntDef(flag = true, prefix = { "TYPE_" }, value = { @IntDef(flag = true, prefix = { "TYPE_" }, value = {