drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix more audio effects auto tests" into gingerbread

Browse Source
This commit is contained in:
Eric Laurent
2010-09-22 15:53:49 -07:00
committed by Android (Google) Code Review
parent a72bb404ce ec1e9c7a44
commit 3efbc55545
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java
View File

@ -45,6 +45,7 @@ public class MediaBassBoostTest extends ActivityInstrumentationTestCase2<MediaFr
private String TAG = "MediaBassBoostTest"; private String TAG = "MediaBassBoostTest";
private final static int MIN_ENERGY_RATIO_2 = 3; private final static int MIN_ENERGY_RATIO_2 = 3;
private final static short TEST_STRENGTH = 500; private final static short TEST_STRENGTH = 500;
private final static int TEST_VOLUME = 4;
private BassBoost mBassBoost = null; private BassBoost mBassBoost = null;
private int mSession = -1; private int mSession = -1;
@ -192,7 +193,7 @@ public class MediaBassBoostTest extends ActivityInstrumentationTestCase2<MediaFr
AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
am.setStreamVolume(AudioManager.STREAM_MUSIC, am.setStreamVolume(AudioManager.STREAM_MUSIC,
am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), TEST_VOLUME,
0); 0);
try { try {

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java
View File

@ -48,6 +48,7 @@ public class MediaEqualizerTest extends ActivityInstrumentationTestCase2<MediaFr
private final static int MAX_BAND_LEVEL = 1500; private final static int MAX_BAND_LEVEL = 1500;
private final static int TEST_FREQUENCY_MILLIHERTZ = 1000000; private final static int TEST_FREQUENCY_MILLIHERTZ = 1000000;
private final static int MIN_NUMBER_OF_PRESETS = 4; private final static int MIN_NUMBER_OF_PRESETS = 4;
private final static int TEST_VOLUME = 4;
private Equalizer mEqualizer = null; private Equalizer mEqualizer = null;
private int mSession = -1; private int mSession = -1;
@ -259,7 +260,7 @@ public class MediaEqualizerTest extends ActivityInstrumentationTestCase2<MediaFr
AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
am.setStreamVolume(AudioManager.STREAM_MUSIC, am.setStreamVolume(AudioManager.STREAM_MUSIC,
am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), TEST_VOLUME,
0); 0);
try { try {
probe = new EnergyProbe(0); probe = new EnergyProbe(0);

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java
View File

@ -45,6 +45,7 @@ public class MediaVirtualizerTest extends ActivityInstrumentationTestCase2<Media
private String TAG = "MediaVirtualizerTest"; private String TAG = "MediaVirtualizerTest";
private final static int MIN_ENERGY_RATIO_2 = 3; private final static int MIN_ENERGY_RATIO_2 = 3;
private final static short TEST_STRENGTH = 500; private final static short TEST_STRENGTH = 500;
private final static int TEST_VOLUME = 4;
private Virtualizer mVirtualizer = null; private Virtualizer mVirtualizer = null;
private int mSession = -1; private int mSession = -1;
@ -193,7 +194,7 @@ public class MediaVirtualizerTest extends ActivityInstrumentationTestCase2<Media
AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);
int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
am.setStreamVolume(AudioManager.STREAM_MUSIC, am.setStreamVolume(AudioManager.STREAM_MUSIC,
am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), TEST_VOLUME,
0); 0);
try { try {