commit a81bcd66ed388a8e7bdb87cd7c665532f808615d
author Brian Muramatsu <btmura@google.com> Wed Apr 04 16:41:52 2012 -0700
committer Brian Muramatsu <btmura@google.com> Wed Apr 04 16:41:52 2012 -0700
tree ea0a950edd71d6733680509fcbda3bcbb820e434
parent bb828157aef048a28edefc2796fa64b472ab3c32

Fix MediaPlayerFlakyNetworkTest NPE

Bug 6288085

MediaPlayerFlakyNetworkTest sets mMediaPlayer to null so just check
whether its null before releasing.

Change-Id: I6fe00d7ccc155db98539aaf91a0f84da459b4e05

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 0241357..ae85cd2 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -107,8 +107,12 @@
 
     @Override
     protected void tearDown() throws Exception {
-        mMediaPlayer.release();
-        mMediaPlayer2.release();
+        if (mMediaPlayer != null) {
+            mMediaPlayer.release();
+        }
+        if (mMediaPlayer2 != null) {
+            mMediaPlayer2.release();
+        }
         super.tearDown();
     }