diff options
3 files changed, 4 insertions, 5 deletions
diff --git a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java index 19fb2c9b05dc..0a8c5703abcd 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java @@ -51,7 +51,6 @@ import android.os.Message; import android.os.UserHandle; import android.os.VibrationEffect; import android.os.Vibrator; -import android.platform.test.annotations.FlakyTest; import android.provider.Settings; import android.testing.TestableContext; import android.util.DebugUtils; @@ -59,6 +58,7 @@ import android.view.InputDevice; import android.view.MotionEvent; import android.view.ViewConfiguration; +import androidx.test.filters.FlakyTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.ConcurrentUtils; diff --git a/services/tests/vibrator/TEST_MAPPING b/services/tests/vibrator/TEST_MAPPING index f0a7e470f8fd..39bd238fc202 100644 --- a/services/tests/vibrator/TEST_MAPPING +++ b/services/tests/vibrator/TEST_MAPPING @@ -3,9 +3,8 @@ { "name": "FrameworksVibratorServicesTests", "options": [ - {"exclude-annotation": "android.platform.test.annotations.LargeTest"}, - {"exclude-annotation": "android.platform.test.annotations.FlakyTest"}, {"exclude-annotation": "androidx.test.filters.FlakyTest"}, + {"exclude-annotation": "androidx.test.filters.LargeTest"}, {"exclude-annotation": "org.junit.Ignore"} ] } 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 edc5df20231a..44cf333bd5d6 100644 --- a/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java +++ b/services/tests/vibrator/src/com/android/server/vibrator/VibrationThreadTest.java @@ -60,11 +60,11 @@ 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; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; import com.android.server.LocalServices; |