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

Commit 6a056185 authored by Ahmad Khalil's avatar Ahmad Khalil Committed by Android (Google) Code Review
Browse files

Merge "Fixing 4 flaky tests"

parents b2e1e38c 8c7e6d73

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

+7 −8
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ public class VibratorManagerServiceTest { 
    private VibratorFrameworkStatsLogger mVibratorFrameworkStatsLoggerMock;

    @Mock

    private VirtualDeviceManagerInternal mVirtualDeviceManagerInternalMock;

    @Mock

    private AudioManager mAudioManagerMock;



    private final Map<Integer, FakeVibratorControllerProvider> mVibratorProviders = new HashMap<>();
@@ -204,6 +206,7 @@ public class VibratorManagerServiceTest { 
        when(mContextSpy.getSystemService(eq(Context.INPUT_SERVICE)))

                .thenReturn(mInputManager);

        when(mContextSpy.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManagerMock);

        when(mContextSpy.getSystemService(eq(Context.AUDIO_SERVICE))).thenReturn(mAudioManagerMock);

        when(mIInputManagerMock.getInputDeviceIds()).thenReturn(new int[0]);

        when(mPackageManagerInternalMock.getSystemUiServiceComponent())

                .thenReturn(new ComponentName("", ""));
@@ -234,7 +237,7 @@ public class VibratorManagerServiceTest { 
                Vibrator.VIBRATION_INTENSITY_MEDIUM);

        setUserSetting(Settings.System.HAPTIC_FEEDBACK_INTENSITY,

                Vibrator.VIBRATION_INTENSITY_MEDIUM);



        setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        addLocalServiceMock(PackageManagerInternal.class, mPackageManagerInternalMock);

        addLocalServiceMock(PowerManagerInternal.class, mPowerManagerInternalMock);

        addLocalServiceMock(VirtualDeviceManagerInternal.class, mVirtualDeviceManagerInternalMock);
@@ -503,12 +506,10 @@ public class VibratorManagerServiceTest { 
            service.registerVibratorStateListener(i, listeners[i]);

        }



        vibrate(service, CombinedVibration.startParallel()

        vibrateAndWaitUntilFinished(service, CombinedVibration.startParallel()

                .addVibrator(0, VibrationEffect.createOneShot(40, 100))

                .addVibrator(1, VibrationEffect.get(VibrationEffect.EFFECT_CLICK))

                .combine(), ALARM_ATTRS);

        // Wait until service knows vibrator is on.

        assertTrue(waitUntil(s -> s.isVibrating(0), service, TEST_TIMEOUT_MILLIS));



        verify(listeners[0]).onVibrating(eq(true));

        verify(listeners[1]).onVibrating(eq(true));
@@ -1696,7 +1697,7 @@ public class VibratorManagerServiceTest { 
        VibratorManagerService service = createSystemReadyService();



        VibrationEffect repeatingEffect = VibrationEffect.createWaveform(

                new long[]{10, 10_000}, new int[]{255, 0}, 1);

                new long[]{100, 200, 300}, new int[]{128, 255, 255}, 1);

        vibrate(service, repeatingEffect, ALARM_ATTRS);



        // VibrationThread will start this vibration async, so wait until vibration is triggered.
@@ -2225,9 +2226,7 @@ public class VibratorManagerServiceTest { 
    }



    private void setRingerMode(int ringerMode) {

        AudioManager audioManager = mContextSpy.getSystemService(AudioManager.class);

        audioManager.setRingerModeInternal(ringerMode);

        assertEquals(ringerMode, audioManager.getRingerModeInternal());

        when(mAudioManagerMock.getRingerModeInternal()).thenReturn(ringerMode);

    }



    private void setUserSetting(String settingName, int value) {