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

Commit d0b05ade authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Mark flaky test until fix is propagated to presubmit invocations" into main

parents 870ca5ea 37aab5cb

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ import android.os.vibrator.RampSegment; 
import android.os.vibrator.StepSegment;

import android.os.vibrator.StepSegment;

import android.os.vibrator.VibrationConfig;

import android.os.vibrator.VibrationConfig;

import android.os.vibrator.VibrationEffectSegment;

import android.os.vibrator.VibrationEffectSegment;

import android.platform.test.annotations.FlakyTest;

import android.platform.test.annotations.LargeTest;

import android.platform.test.annotations.LargeTest;

import android.util.SparseArray;

import android.util.SparseArray;
@@ -1490,6 +1491,7 @@ public class VibrationThreadTest { 
        assertTrue(fakeVibrator.getAmplitudes().isEmpty());

        assertTrue(fakeVibrator.getAmplitudes().isEmpty());

    }

    }





    @FlakyTest

    @Test

    @Test

    public void vibrate_multipleVibrations_withCancel() throws Exception {

    public void vibrate_multipleVibrations_withCancel() throws Exception {

        mVibratorProviders.get(VIBRATOR_ID).setSupportedEffects(

        mVibratorProviders.get(VIBRATOR_ID).setSupportedEffects(