diff options
| author | 2023-07-28 13:05:34 +0000 | |
|---|---|---|
| committer | 2023-07-28 13:05:34 +0000 | |
| commit | d0b05ade143c6bf3d460a77a88e19bb859db96e0 (patch) | |
| tree | 8e4e6af5aea85afa82e9136055477992186ad019 | |
| parent | 870ca5eaeafe2c889112c0c141f97d99853b118d (diff) | |
| parent | 37aab5cbf2b9a9f2783e74c19ad93a89a0934aaf (diff) | |
Merge "Mark flaky test until fix is propagated to presubmit invocations" into main
| -rw-r--r-- | services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java index 709e9c3a2cb1..e739033076a6 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java @@ -60,6 +60,7 @@ import android.os.vibrator.RampSegment; import android.os.vibrator.StepSegment; import android.os.vibrator.VibrationConfig; import android.os.vibrator.VibrationEffectSegment; +import android.platform.test.annotations.FlakyTest; import android.platform.test.annotations.LargeTest; import android.util.SparseArray; @@ -1490,6 +1491,7 @@ public class VibrationThreadTest { assertTrue(fakeVibrator.getAmplitudes().isEmpty()); } + @FlakyTest @Test public void vibrate_multipleVibrations_withCancel() throws Exception { mVibratorProviders.get(VIBRATOR_ID).setSupportedEffects( |