Merge "AudioService: fix capture policy restoration" into sc-dev

2021-07-02 09:21:09 +00:00
parent 023fa14302 07bd4300e3
commit 0dee554595
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
+++ b/services/core/java/com/android/server/audio/PlaybackActivityMonitor.java
@@ -380,10 +380,12 @@ public final class PlaybackActivityMonitor
    }

    /**
-     * Return all cached capture policies.
+     * Return a copy of all cached capture policies.
     */
    public HashMap<Integer, Integer> getAllAllowedCapturePolicies() {
-        return mAllowedCapturePolicies;
+        synchronized (mAllowedCapturePolicies) {
+            return (HashMap<Integer, Integer>) mAllowedCapturePolicies.clone();
+        }
    }

    private void updateAllowedCapturePolicy(AudioPlaybackConfiguration apc, int capturePolicy) {