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

Commit c81e0ad9 authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix audio effect tests 

Make sure that audio effect tests relying on audio to actually play on
the music stream are not affected by current ringer mode. Silent mode
can mute music stream on tablets.

Issue 5638685.

Change-Id: Icdf14696986145ae3f50fc15d358335487d3525f
parent 26650aef

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaEnvReverbTest.java

+6 −0
Original line number Diff line number Diff line
@@ -353,6 +353,8 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
        AudioEffect vc = null;

        MediaPlayer mp = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -411,6 +413,7 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
                probe.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }
@@ -425,6 +428,8 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
        MediaPlayer mp = null;

        AudioEffect rvb = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -495,6 +500,7 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
                probe.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaPresetReverbTest.java

+6 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
        AudioEffect vc = null;

        MediaPlayer mp = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -254,6 +256,7 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
                probe.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }
@@ -268,6 +271,8 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
        MediaPlayer mp = null;

        AudioEffect rvb = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -336,6 +341,7 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
                probe.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaVisualizerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF 
        AudioEffect vc = null;

        MediaPlayer mp = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -264,6 +266,7 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF 
                vc.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }
@@ -276,6 +279,8 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF 
        AudioEffect vc = null;

        MediaPlayer mp = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int ringerMode = am.getRingerMode();

        am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),
@@ -393,6 +398,7 @@ public class MediaVisualizerTest extends ActivityInstrumentationTestCase2<MediaF 
                vc.release();

            }

            am.setStreamVolume(AudioManager.STREAM_MUSIC, volume, 0);

            am.setRingerMode(ringerMode);

        }

        assertTrue(msg, result);

    }