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

Commit 30bcbccb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix flaky VibratorSettingsTest"

parents 00da8989 54ae227e

services/core/java/com/android/server/vibrator/VibrationSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -152,8 +152,8 @@ public final class VibrationSettings { 
    /**

     * Return {@code true} if the device should vibrate for ringtones.

     *

     * <p>This checks the current {@link AudioManager#getRingerMode()} against user settings for

     * vibrations while ringing.

     * <p>This checks the current {@link AudioManager#getRingerModeInternal()} against user settings

     * for vibrations while ringing.

     */

    public boolean shouldVibrateForRingtone() {

        int ringerMode = mAudioManager.getRingerModeInternal();

services/tests/servicestests/src/com/android/server/VibratorServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ public class VibratorServiceTest { 
    private void setRingerMode(int ringerMode) {

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

        audioManager.setRingerModeInternal(ringerMode);

        assertEquals(ringerMode, audioManager.getRingerMode());

        assertEquals(ringerMode, audioManager.getRingerModeInternal());

    }



    private void setUserSetting(String settingName, int value) {

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

+17 −25
Original line number Diff line number Diff line
@@ -133,20 +133,16 @@ public class VibrationSettingsTest { 
    public void shouldVibrateForRingtones_withVibrateWhenRinging_onlyIgnoreSettingsForSilentMode() {

        setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 1);



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);

        assertEquals(AudioManager.RINGER_MODE_SILENT, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_SILENT);

        assertFalse(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_MAX);

        assertEquals(AudioManager.RINGER_MODE_MAX, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_MAX);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);

        assertEquals(AudioManager.RINGER_MODE_NORMAL, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_VIBRATE);

        assertEquals(AudioManager.RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_VIBRATE);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());

    }
@@ -155,20 +151,16 @@ public class VibrationSettingsTest { 
        setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 0);

        setGlobalSetting(Settings.Global.APPLY_RAMPING_RINGER, 1);



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);

        assertEquals(AudioManager.RINGER_MODE_SILENT, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_SILENT);

        assertFalse(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_MAX);

        assertEquals(AudioManager.RINGER_MODE_MAX, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_MAX);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);

        assertEquals(AudioManager.RINGER_MODE_NORMAL, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_VIBRATE);

        assertEquals(AudioManager.RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_VIBRATE);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());

    }
@@ -177,20 +169,16 @@ public class VibrationSettingsTest { 
        setUserSetting(Settings.System.VIBRATE_WHEN_RINGING, 0);

        setGlobalSetting(Settings.Global.APPLY_RAMPING_RINGER, 0);



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_VIBRATE);

        assertEquals(AudioManager.RINGER_MODE_VIBRATE, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_VIBRATE);

        assertTrue(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);

        assertEquals(AudioManager.RINGER_MODE_SILENT, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_SILENT);

        assertFalse(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_MAX);

        assertEquals(AudioManager.RINGER_MODE_MAX, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_MAX);

        assertFalse(mVibrationSettings.shouldVibrateForRingtone());



        mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);

        assertEquals(AudioManager.RINGER_MODE_NORMAL, mAudioManager.getRingerMode());

        setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        assertFalse(mVibrationSettings.shouldVibrateForRingtone());

    }
@@ -294,6 +282,10 @@ public class VibrationSettingsTest { 
        Settings.Global.putInt(mContextSpy.getContentResolver(), settingName, value);

        // FakeSettingsProvider don't support testing triggering ContentObserver yet.

        mVibrationSettings.updateSettings();

        mAudioManager.reloadAudioSettings();

    }



    private void setRingerMode(int ringerMode) {

        mAudioManager.setRingerModeInternal(ringerMode);

        assertEquals(ringerMode, mAudioManager.getRingerModeInternal());

    }

}