Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
index e4eca4d..d780c57 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTest.java
@@ -174,9 +174,7 @@
mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
mp.setWakeMode(mContext, PowerManager.PARTIAL_WAKE_LOCK);
- assertFalse(mp.isPlaying());
mp.start();
- assertTrue(mp.isPlaying());
assertFalse(mp.isLooping());
mp.setLooping(true);
@@ -190,13 +188,6 @@
mp.seekTo(pos + seekDuration);
assertEquals(pos + seekDuration, mp.getCurrentPosition(), tolerance);
- // test pause and restart
- mp.pause();
- Thread.sleep(SLEEP_TIME);
- assertFalse(mp.isPlaying());
- mp.start();
- assertTrue(mp.isPlaying());
-
// test stop and restart
mp.stop();
mp.reset();
@@ -204,14 +195,9 @@
mp.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
afd.close();
mp.prepare();
- assertFalse(mp.isPlaying());
mp.start();
- assertTrue(mp.isPlaying());
- // waiting to complete
- while(mp.isPlaying()) {
- Thread.sleep(SLEEP_TIME);
- }
+ Thread.sleep(SLEEP_TIME);
} finally {
mp.release();
}