diff --git a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java index 3f4f981dc0b8b..23a0782dc8a3e 100644 --- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java +++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java @@ -989,21 +989,16 @@ public final class PlaybackActivityMonitor } List getActivePlaybackConfigurations(boolean isPrivileged) { - synchronized(mPlayers) { + synchronized (mPlayerLock) { if (isPrivileged) { return new ArrayList(mPlayers.values()); } else { - final List configsPublic; - synchronized (mPlayerLock) { - configsPublic = anonymizeForPublicConsumption( + return anonymizeForPublicConsumption( new ArrayList(mPlayers.values())); - } - return configsPublic; } } } - /** * Inner class to track clients that want to be notified of playback updates */