summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-10-06 13:26:43 -0700
committerThe Android Automerger <android-build@google.com>2014-10-22 11:32:51 -0700
commit5b43876b9402b60b8e5772074b7e0ab58ec20890 (patch)
tree813a15dea3d0e0e0d5fb21e77825187327530691
parent8779e0d79f0a2f10fb3385cccdb9ca0c9a3b8723 (diff)
downloadplatform_cts-5b43876b9402b60b8e5772074b7e0ab58ec20890.tar.gz
platform_cts-5b43876b9402b60b8e5772074b7e0ab58ec20890.tar.bz2
platform_cts-5b43876b9402b60b8e5772074b7e0ab58ec20890.zip
Clean up visualizer in case of failure
so that the actual cause of the error can be reported. Bug: 17781474 Change-Id: I95e45d3c6b2b21c9859e4542d17883dd52e55aae
-rw-r--r--tests/tests/media/src/android/media/cts/MediaPlayerTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 2815d81efc6..78ba1492152 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -593,14 +593,16 @@ public class MediaPlayerTest extends MediaPlayerTestBase {
}
byte [] vizdata = new byte[size];
Visualizer vis = new Visualizer(session);
- assertTrue(vis.setCaptureSize(vizdata.length) == Visualizer.SUCCESS);
- assertTrue(vis.setEnabled(true) == Visualizer.SUCCESS);
AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
int oldRingerMode = am.getRingerMode();
am.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
int oldvolume = am.getStreamVolume(AudioManager.STREAM_MUSIC);
am.setStreamVolume(AudioManager.STREAM_MUSIC, 1, 0);
try {
+ assertEquals("setCaptureSize failed",
+ Visualizer.SUCCESS, vis.setCaptureSize(vizdata.length));
+ assertEquals("setEnabled failed", Visualizer.SUCCESS, vis.setEnabled(true));
+
mp1.setNextMediaPlayer(mp2);
mp1.start();
assertTrue(mp1.isPlaying());