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

Commit a3a9dbe1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15178916

Change-Id: I52a4fc5da6094c2897ec87489b4cc69bc9e9585a
parents c0ff284d 0dee5545

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

+4 −2
Original line number Diff line number Diff line
@@ -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) {