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

Commit 572b5b09 authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Allowing ACTION_CANCEL events to come from device 0" into main

parents fd13b2c6 7a1beb55

src/com/android/launcher3/testing/TestLogging.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public final class TestLogging { 
            // be more useful.

            // That's why we pass false as the value for the 'reportToTapl' parameter.

            recordEventSlow(sequence, message + ": " + event, false);

            registerEventNotFromTest(event);

            if (action != MotionEvent.ACTION_CANCEL) registerEventNotFromTest(event);

        }

    }

tests/src/com/android/launcher3/util/rule/FailureWatcher.java

+3 −2
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ public class FailureWatcher extends TestWatcher { 
                        throw new AssertionError(

                                "Launcher received events not sent by the test. This may mean "

                                        + "that the touch screen of the lab device has sent false"

                                        + " events. See the logcat for TaplEvents tag and look "

                                        + "for events with deviceId != -1");

                                        + " events. See the logcat for "

                                        + "TaplEvents|LauncherEvents|TaplTarget tag and look for "

                                        + "events with deviceId != -1");

                    }

                }

            }