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

Commit 5dbcff08 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

Access AudioPlaybackConfiguration players under mPlayerLock 

Test: build and flash to Panther
Test: run cts-dev -m CtsMediaAudioTestCases  -t android.media.audio.cts.AudioPlaybackConfigurationTest
Bug: 247551216
Change-Id: I7bd9b61ad46ba2bf2395daad8257f9cd79c73159
(cherry picked from commit b89353ba)
Merged-In: I7bd9b61ad46ba2bf2395daad8257f9cd79c73159
parent 53e00389

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

+2 −7
Original line number Diff line number Diff line
@@ -989,20 +989,15 @@ public final class PlaybackActivityMonitor 
    }



    List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(boolean isPrivileged) {

        synchronized(mPlayers) {

        synchronized (mPlayerLock) {

            if (isPrivileged) {

                return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values());

            } else {

                final List<AudioPlaybackConfiguration> configsPublic;

                synchronized (mPlayerLock) {

                    configsPublic = anonymizeForPublicConsumption(

                return anonymizeForPublicConsumption(

                            new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()));

            }

                return configsPublic;

        }

    }

    }





    /**

     * Inner class to track clients that want to be notified of playback updates