Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Access AudioPlaybackConfiguration players under mPlayerLock" into udc-qpr-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-01 07:48:19 +00:00
committed by Android (Google) Code Review
parent 747182caf9 5dbcff080c
commit d414349d4e
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
View File

@@ -989,21 +989,16 @@ public final class PlaybackActivityMonitor
} }
List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(boolean isPrivileged) { List<AudioPlaybackConfiguration> getActivePlaybackConfigurations(boolean isPrivileged) {
synchronized(mPlayers) { synchronized (mPlayerLock) {
if (isPrivileged) { if (isPrivileged) {
return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()); return new ArrayList<AudioPlaybackConfiguration>(mPlayers.values());
} else { } else {
final List<AudioPlaybackConfiguration> configsPublic; return anonymizeForPublicConsumption(
synchronized (mPlayerLock) {
configsPublic = anonymizeForPublicConsumption(
new ArrayList<AudioPlaybackConfiguration>(mPlayers.values())); new ArrayList<AudioPlaybackConfiguration>(mPlayers.values()));
}
return configsPublic;
} }
} }
} }
/** /**
* Inner class to track clients that want to be notified of playback updates * Inner class to track clients that want to be notified of playback updates
*/ */