Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev

Browse Source 
am: acf6698f0c

Change-Id: Ie8c1fc0052382d77ec9f4c9727c73cddfc0c3e1f
This commit is contained in:
Kevin Rocard
2019-04-15 09:17:00 -07:00
committed by android-build-merger
parent e39528c4f7 acf6698f0c
commit 71829af911
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -23251,6 +23251,7 @@ package android.media {
method public int generateAudioSessionId(); method public int generateAudioSessionId();
method @NonNull public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations(); method @NonNull public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations();
method @NonNull public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations(); method @NonNull public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();
method public int getAllowedCapturePolicy();
method public android.media.AudioDeviceInfo[] getDevices(int); method public android.media.AudioDeviceInfo[] getDevices(int);
method public java.util.List<android.media.MicrophoneInfo> getMicrophones() throws java.io.IOException; method public java.util.List<android.media.MicrophoneInfo> getMicrophones() throws java.io.IOException;
method public int getMode(); method public int getMode();

15
media/java/android/media/AudioManager.java
View File

@@ -1512,7 +1512,22 @@ public class AudioManager {
int result = AudioSystem.setAllowedCapturePolicy(Process.myUid(), flags); int result = AudioSystem.setAllowedCapturePolicy(Process.myUid(), flags);
if (result != AudioSystem.AUDIO_STATUS_OK) { if (result != AudioSystem.AUDIO_STATUS_OK) {
Log.e(TAG, "Could not setAllowedCapturePolicy: " + result); 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;
} }
//==================================================================== //====================================================================