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

Commit 20757be6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix flaky test... 

Merge "Fix flaky test VibrationThreadTest#vibrate_multipleVibrations_withCancel" into main am: 789efc98

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3276113



Change-Id: I673d3539940b205195c640d90bf4611f9515e21d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e4daa0b 789efc98

services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java

+0 −4
Original line number Diff line number Diff line
@@ -1746,10 +1746,6 @@ public class VibrationThreadTest { 
        assertTrue("Tested duration=" + duration4, duration4 < 2000);



        // Effect5: played normally after effect4, which may or may not have played.



        verify(mControllerCallbacks).onComplete(eq(VIBRATOR_ID), eq(vibrationId5));

        verifyCallbacksTriggered(vibrationId5, Vibration.Status.FINISHED);



        assertEquals(Arrays.asList(expectedPrebaked(VibrationEffect.EFFECT_CLICK)),

                fakeVibrator.getEffectSegments(vibrationId5));

    }