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

Commit 28cf84c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SoundEffectsHelper: Update resource info after unloading"

parents 798d4cbf e7e67fe1

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();