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

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

Merge "Events: moving logcat filter 1 sec back" into ub-launcher3-master

parents 30423879 f81dc291
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1219,9 +1219,12 @@ public final class LauncherInstrumentation {
    private List<String> getEvents() {
        final ArrayList<String> events = new ArrayList<>();
        try {
            // Logcat may skip events after the specified time. Querying for events starting 1 sec
            // earlier.
            final Date startTime = new Date(mStartRecordingTime.getTime() - 1000);
            final String logcatEvents = mDevice.executeShellCommand(
                    "logcat -d -v year --pid=" + getPid() + " -t "
                            + DATE_TIME_FORMAT.format(mStartRecordingTime).replaceAll(" ", "")
                            + DATE_TIME_FORMAT.format(startTime).replaceAll(" ", "")
                            + " -s " + TestProtocol.TAPL_EVENTS_TAG);
            final Matcher matcher = EVENT_LOG_ENTRY.matcher(logcatEvents);
            while (matcher.find()) {