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

Commit 47448a63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest"... 

Merge "Add Flaky annotation to 4 flaky tests in VibratorManagerServiceTest" into udc-dev-plus-aosp am: f7b584dc am: 106a8f88

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24706952



Change-Id: I67d16ae45adf2e7d0e2b12581f2aa221d6d7835b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0e77010 106a8f88

services/tests/servicestests/src/com/android/server/vibrator/VibratorManagerServiceTest.java

+5 −0
Original line number Diff line number Diff line
@@ -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 {