From 019f60d393168103e18beb12386fd0d06f83dbdf Mon Sep 17 00:00:00 2001 From: Kevin Rocard Date: Tue, 9 Apr 2019 16:25:26 -0700 Subject: [PATCH] Add AudioManager.getAllowedCapturePolicy For now the value is stored in AudioManager. It needs to be moved in AudioService. Bug: 129948989 Test: atest AudioAttributesTest Change-Id: I7f3ef4c9dbeb00169374efcc5829666c0e8121d5 Signed-off-by: Kevin Rocard --- api/current.txt | 1 + media/java/android/media/AudioManager.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/api/current.txt b/api/current.txt index 03648ea01c78e..b4688b49fc1b1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -23242,6 +23242,7 @@ package android.media { method public int generateAudioSessionId(); method @NonNull public java.util.List getActivePlaybackConfigurations(); method @NonNull public java.util.List getActiveRecordingConfigurations(); + method public int getAllowedCapturePolicy(); method public android.media.AudioDeviceInfo[] getDevices(int); method public java.util.List getMicrophones() throws java.io.IOException; method public int getMode(); diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index dc5c6639375b7..79428b6aaf4e4 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1499,7 +1499,22 @@ public class AudioManager { int result = AudioSystem.setAllowedCapturePolicy(Process.myUid(), flags); if (result != AudioSystem.AUDIO_STATUS_OK) { Log.e(TAG, "Could not setAllowedCapturePolicy: " + result); + return; } + mCapturePolicy = capturePolicy; + } + + @AudioAttributes.CapturePolicy + private int mCapturePolicy = AudioAttributes.ALLOW_CAPTURE_BY_ALL; + + /** + * Return the capture policy. + * @return the capture policy set by {@link #setAllowedCapturePolicy(int)} or + * the default if it was not called. + */ + @AudioAttributes.CapturePolicy + public int getAllowedCapturePolicy() { + return mCapturePolicy; } //====================================================================