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

Commit e7e67fe1 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

SoundEffectsHelper: Update resource info after unloading 

SoundEffectsHelper.mResources info needs to be reset
after unloading of samples. Lack of this cleanup is
benign when subsequent resource loading succeeds, but
in case it doesn't having stale info in mResources can
lead to confusion.

Test: atest android.media.cts.AudioManagerTest#testSoundEffects
Change-Id: Ia7a1cc4315bfcf05fa4af915c4ad690183ed4368
parent d262298b

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

+5 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ class SoundEffectsHelper { 
            mFileName = fileName;

            mSampleId = EFFECT_NOT_IN_SOUND_POOL;

        }

        void unload() {

            mSampleId = EFFECT_NOT_IN_SOUND_POOL;

            mLoaded = false;

        }

    }

    // All the fields below are accessed by the worker thread exclusively

    private final List<Resource> mResources = new ArrayList<Resource>();
@@ -230,6 +234,7 @@ class SoundEffectsHelper { 
        for (Resource res : mResources) {

            if (res.mSampleId != EFFECT_NOT_IN_SOUND_POOL) {

                mSoundPool.unload(res.mSampleId);

                res.unload();

            }

        }

        mSoundPool.release();