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

Commit 53a70ac4 authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Use androidx Flaky annotation for device tests." into main

parents dd0b9871 25fb412e

services/tests/servicestests/src/com/android/server/accessibility/magnification/FullScreenMagnificationGestureHandlerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/tests/vibrator/TEST_MAPPING

+1 −2
Original line number Diff line number Diff line
@@ -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"}

      ]

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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;