diff options
| author | Eric Laurent <elaurent@google.com> | 2010-09-22 15:59:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 15:59:28 -0700 |
| commit | 4744774a7a3644489ec1159f5554a41eb943a51b (patch) | |
| tree | 68308e1bd0bf96981c5deac68f35aa411c50539d /media | |
| parent | 2de0a50a9ab05db07b4ae5c1401b1dbd26ce28e1 (diff) | |
| parent | 3efbc55545673f3988cb1b2934b903d78f8873cd (diff) | |
| download | frameworks_base-4744774a7a3644489ec1159f5554a41eb943a51b.zip frameworks_base-4744774a7a3644489ec1159f5554a41eb943a51b.tar.gz frameworks_base-4744774a7a3644489ec1159f5554a41eb943a51b.tar.bz2 | |
am 3efbc555: Merge "Fix more audio effects auto tests" into gingerbread
Merge commit '3efbc55545673f3988cb1b2934b903d78f8873cd' into gingerbread-plus-aosp
* commit '3efbc55545673f3988cb1b2934b903d78f8873cd':
Fix more audio effects auto tests
Diffstat (limited to 'media')
3 files changed, 6 insertions, 3 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java index aca729e..b5b1c3e 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaBassBoostTest.java @@ -45,6 +45,7 @@ public class MediaBassBoostTest extends ActivityInstrumentationTestCase2<MediaFr private String TAG = "MediaBassBoostTest"; private final static int MIN_ENERGY_RATIO_2 = 3; private final static short TEST_STRENGTH = 500; + private final static int TEST_VOLUME = 4; private BassBoost mBassBoost = null; private int mSession = -1; @@ -192,7 +193,7 @@ public class MediaBassBoostTest extends ActivityInstrumentationTestCase2<MediaFr AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, - am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), + TEST_VOLUME, 0); try { diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java index 7b3945d..a78668c 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEqualizerTest.java @@ -48,6 +48,7 @@ public class MediaEqualizerTest extends ActivityInstrumentationTestCase2<MediaFr private final static int MAX_BAND_LEVEL = 1500; private final static int TEST_FREQUENCY_MILLIHERTZ = 1000000; private final static int MIN_NUMBER_OF_PRESETS = 4; + private final static int TEST_VOLUME = 4; private Equalizer mEqualizer = null; private int mSession = -1; @@ -259,7 +260,7 @@ public class MediaEqualizerTest extends ActivityInstrumentationTestCase2<MediaFr AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, - am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), + TEST_VOLUME, 0); try { probe = new EnergyProbe(0); diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java index 517d575..7123db4 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaVirtualizerTest.java @@ -45,6 +45,7 @@ public class MediaVirtualizerTest extends ActivityInstrumentationTestCase2<Media private String TAG = "MediaVirtualizerTest"; private final static int MIN_ENERGY_RATIO_2 = 3; private final static short TEST_STRENGTH = 500; + private final static int TEST_VOLUME = 4; private Virtualizer mVirtualizer = null; private int mSession = -1; @@ -193,7 +194,7 @@ public class MediaVirtualizerTest extends ActivityInstrumentationTestCase2<Media AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE); int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC); am.setStreamVolume(AudioManager.STREAM_MUSIC, - am.getStreamMaxVolume(AudioManager.STREAM_MUSIC), + TEST_VOLUME, 0); try { |