diff --git a/media/java/android/media/MediaActionSound.java b/media/java/android/media/MediaActionSound.java
index d0e6910ba6795..7a520feb6af07 100644
--- a/media/java/android/media/MediaActionSound.java
+++ b/media/java/android/media/MediaActionSound.java
@@ -185,10 +185,14 @@ public class MediaActionSound {
     };
 
     /**
-     * Free up all audio resources used by this MediaActionSound instance
+     * Free up all audio resources used by this MediaActionSound instance. Do
+     * not call any other methods on a MediaActionSound instance after calling
+     * release().
      */
     public void release() {
-        mSoundPool.release();
-        mSoundPool = null;
+        if (mSoundPool != null) {
+            mSoundPool.release();
+            mSoundPool = null;
+        }
     }
 }