commit 220ffc72d65497dfdacc6ccca631ef654868728e
author Mark Hong <sungmin.h@samsung.com> Thu Jun 28 12:46:04 2018 -0700
committer Robert Shih <robertshih@google.com> Tue Jul 10 12:36:32 2018 -0700
tree f4da96e2d8b0ab5bba071adf07dd74b719c64365
parent a41fffd5edd61d73fe26e447f6d57a5d582668ae

Fix for testHlsSampleAes_bbb_unmuxed_1500k
MediaPlayer state won't be changed to IDLE for setting setDataSources properly when playLiveVideoTest() is called while in iterating of multiple (H/W and S/W) codecs
So it will cause illegalStateException

BUG: 110945779

Change-Id: Ic8c459fc329a13bfb20884f7e39726343e613ea6
Signed-off-by: Mark Hong <sungmin.h@samsung.com>

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

diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index d2b7f23..ff8efc7 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -207,6 +207,7 @@
         boolean playedSuccessfully = false;
         for (int i = 0; i < STREAM_RETRIES; i++) {
           try {
+            mMediaPlayer.reset();
             mMediaPlayer.setDataSource(path);
             playLoadedVideo(width, height, playTime);
             playedSuccessfully = true;
@@ -239,6 +240,7 @@
         boolean playedSuccessfully = false;
         for (int i = 0; i < STREAM_RETRIES; i++) {
             try {
+                mMediaPlayer.reset();
                 mMediaPlayer.setDataSource(getInstrumentation().getTargetContext(),
                         uri, headers, cookies);
                 playLoadedVideo(width, height, playTime);