commit 2eae9752b8c46bc3c726e48cdcf62844a47b2073
author Ricardo Garcia <rago@google.com> Wed Aug 13 17:20:03 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 13 16:52:03 2014 +0000
tree 5265b96a9d1d332ba507cfb48bbef730ab2b0e16
parent 715f0102c82d9b659ae1770d3cb2110b29cbe2f4
parent 0a54dc03bdf7204caf92ab462906b604386ed03b

Merge "Fixing null pointer error in CTS AudioManagerTest" into lmp-dev

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

diff --git a/tests/tests/media/src/android/media/cts/AudioManagerTest.java b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
index 13e5fd9..3eaafd4 100644
--- a/tests/tests/media/src/android/media/cts/AudioManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioManagerTest.java
@@ -110,6 +110,7 @@
 
     public void testMusicActive() throws Exception {
         MediaPlayer mp = MediaPlayer.create(mContext, MP3_TO_PLAY);
+        assertNotNull(mp);
         mp.setAudioStreamType(AudioManager.STREAM_MUSIC);
         mp.start();
         Thread.sleep(TIME_TO_PLAY);
@@ -393,6 +394,7 @@
         mAudioManager.adjustVolume(ADJUST_RAISE, 0);
 
         MediaPlayer mp = MediaPlayer.create(mContext, MP3_TO_PLAY);
+        assertNotNull(mp);
         mp.setAudioStreamType(STREAM_MUSIC);
         mp.setLooping(true);
         mp.start();