commit 9cdeb8a6c3e10b565810ac4d5c272304e1b01e1d
author Ahmad Khalil <khalilahmad@google.com> Wed Aug 30 10:20:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 30 10:20:42 2023 +0000
tree 2764837195412741cfe80993146f63ee58ed261c
parent 0af9d20600f89c2acd82c25f72b1a1e03cc5d6a0
parent 03eed6ca6af896388c34c2e4d38e03b64a60899e

Merge "Remove FlakyTest from vibrate_multipleSyncedCallbackTriggered_finishSteps" into main

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

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 44cf333..085241f 100644
--- a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java
+++ b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java
@@ -63,7 +63,6 @@
 import android.util.SparseArray;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 
 import com.android.server.LocalServices;
@@ -1005,7 +1004,6 @@
                 mVibratorProviders.get(3).getEffectSegments(vibrationId));
     }
 
-    @FlakyTest
     @Test
     public void vibrate_multipleSyncedCallbackTriggered_finishSteps() throws Exception {
         int[] vibratorIds = new int[]{1, 2};