Merge changes from topic "iorap-snap" into rvc-dev am: b4c187f5ce am: 6610e3ca53 (df37e064) · Commits · e / os / android_frameworks_base

startop/iorap/functional_tests/src/com/google/android/startop/iorap/IorapWorkFlowTest.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -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,13 +326,13 @@ 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+)%\\).",
		+ ".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);

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 = {