Merge "SoundEffectsHelper: Fix NPE when calling into SoundPool" into rvc-dev

1 files changed, 4 insertions, 2 deletions

diff --git a/services/core/java/com/android/server/audio/SoundEffectsHelper.java b/services/core/java/com/android/server/audio/SoundEffectsHelper.java
index cf5bc8d88c73..6d29b0e0078c 100644
--- a/services/core/java/com/android/server/audio/SoundEffectsHelper.java
+++ b/services/core/java/com/android/server/audio/SoundEffectsHelper.java
@@ -247,7 +247,7 @@ class SoundEffectsHelper {
         }
 
         Resource res = mResources.get(mEffects[effect]);
-        if (res.mSampleId != EFFECT_NOT_IN_SOUND_POOL && res.mLoaded) {
+        if (mSoundPool != null && res.mSampleId != EFFECT_NOT_IN_SOUND_POOL && res.mLoaded) {
             mSoundPool.play(res.mSampleId, volFloat, volFloat, 0, 0, 1.0f);
         } else {
             MediaPlayer mediaPlayer = new MediaPlayer();
@@ -511,7 +511,9 @@ class SoundEffectsHelper {
         }
 
         void onComplete(boolean success) {
-            mSoundPool.setOnLoadCompleteListener(null);
+            if (mSoundPool != null) {
+                mSoundPool.setOnLoadCompleteListener(null);
+            }
             for (OnEffectsLoadCompleteHandler handler : mLoadCompleteHandlers) {
                 handler.run(success);
             }