commit c2119c1019168c6dae4f0ebd7afe07da40676ed8
author Marco Nelissen <marcone@google.com> Mon Oct 06 13:26:43 2014 -0700
committer Marco Nelissen <marcone@google.com> Mon Oct 06 13:40:16 2014 -0700
tree 0d5262c8d78454a5137a841595dd08a8352e85fd
parent 04b178a5eab90ab15d441190c58cf84284f34571

Clean up visualizer in case of failure

so that the actual cause of the error can be reported.
Bug: 17781474

Change-Id: I95e45d3c6b2b21c9859e4542d17883dd52e55aae

tests/tests/media/src/android/media/cts/MediaPlayerTest.java

diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index 2815d81..78ba149 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 @@
         }
         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());