Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b6d35ce authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12002734

Change-Id: Ib500ccaff767edeb371b4c2617510db26e3e2e0f
parents 978aa81c c96085f1

services/core/java/com/android/server/audio/SoundEffectsHelper.java

+4 −2
Original line number Diff line number Diff line
@@ -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) {

            if (mSoundPool != null) {

                mSoundPool.setOnLoadCompleteListener(null);

            }

            for (OnEffectsLoadCompleteHandler handler : mLoadCompleteHandlers) {

                handler.run(success);

            }