Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest

Added @Flaky to:
1. onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration
2. vibrate_withOngoingRepeatingVibration_ignoresEffect
3. vibrate_withNewSameImportanceVibrationButOngoingIsRepeating_ignoreNewVibration
4. vibrate_withNewUnknownUsageVibrationAndNotRepeating_ignoreNewVibration

onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration's
failures were blocking presubmit.

Bug: 299481519
Test: N/A
Change-Id: If7c7a2c94db3eac4f4bc79a6c05c35683031a50c
Merged-In: If7c7a2c94db3eac4f4bc79a6c05c35683031a50c
(cherry picked from commit 3e5d158cb53f8988863ada349880051fd5ce19e2)
(cherry picked from commit ea84d650b110714b356a8938662969fae0fba2ae)

1 files changed, 5 insertions, 0 deletions

diff --git a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java
index f158ce14549f..9d2b34cc6ba5 100644
--- a/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java
@@ -84,6 +84,7 @@ import android.view.Display;
 import android.view.InputDevice;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
 
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.util.FrameworkStatsLog;
@@ -813,6 +814,7 @@ public class VibratorManagerServiceTest {
                         eq(AudioAttributes.USAGE_UNKNOWN), anyInt(), anyString());
     }
 
+    @FlakyTest
     @Test
     public void vibrate_withOngoingRepeatingVibration_ignoresEffect() throws Exception {
         mockVibrators(1);
@@ -899,6 +901,7 @@ public class VibratorManagerServiceTest {
         cancelVibrate(service);  // Clean up repeating effect.
     }
 
+    @FlakyTest
     @Test
     public void vibrate_withNewSameImportanceVibrationButOngoingIsRepeating_ignoreNewVibration()
             throws Exception {
@@ -952,6 +955,7 @@ public class VibratorManagerServiceTest {
         cancelVibrate(service);  // Clean up repeating effect.
     }
 
+    @FlakyTest
     @Test
     public void vibrate_withNewUnknownUsageVibrationAndNotRepeating_ignoreNewVibration()
             throws Exception {
@@ -1687,6 +1691,7 @@ public class VibratorManagerServiceTest {
         cancelVibrate(service);  // Clean up long effect.
     }
 
+    @FlakyTest
     @Test
     public void onExternalVibration_withNewSameImportanceButRepeating_cancelsOngoingVibration()
             throws Exception {