Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4c187f5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  iorap: Increase the JobScheduledEvent#TYPE_MAX to 1.
  startop: Fix a bug in iorap functional test.
parents e4516552 be178769

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);

startop/iorap/src/com/google/android/startop/iorap/JobScheduledEvent.java

+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 = {