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

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

Merge "Improving diagnostics when Launcher dies during a gesture" into ub-launcher3-master

parents e997bd68 56fe9150

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
            }



            case TestProtocol.REQUEST_GET_TEST_EVENTS: {

                if (sEvents == null) {

                    // sEvents can be null if Launcher died and restarted after

                    // REQUEST_START_EVENT_LOGGING.

                    return response;

                }



                synchronized (sEvents) {

                    response.putStringArrayList(

                            TestProtocol.TEST_INFO_RESPONSE_FIELD, new ArrayList<>(sEvents));

tests/tapl/com/android/launcher3/tapl/LogEventChecker.java

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ public class LogEventChecker { 
        while (true) {

            rawEvents = mLauncher.getTestInfo(TestProtocol.REQUEST_GET_TEST_EVENTS)

                    .getStringArrayList(TestProtocol.TEST_INFO_RESPONSE_FIELD);

            if (rawEvents == null) return null;



            final int expectedCount = mExpectedEvents.entrySet()

                    .stream().mapToInt(e -> e.getValue().size()).sum();

            if (rawEvents.size() >= expectedCount
@@ -83,6 +85,7 @@ public class LogEventChecker { 


    String verify(long waitForExpectedCountMs, boolean successfulGesture) {

        final ListMap<String> actualEvents = finishSync(waitForExpectedCountMs);

        if (actualEvents == null) return "null event sequences because launcher likely died";



        final StringBuilder sb = new StringBuilder();

        boolean hasMismatches = false;