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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15178916 Change-Id: I52a4fc5da6094c2897ec87489b4cc69bc9e9585a
2021-07-02 16:26:14 +00:00
parent c0ff284d95 0dee554595
commit a3a9dbe127
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) {