diff options
| author | 2021-06-04 10:49:29 +0000 | |
|---|---|---|
| committer | 2021-06-04 10:49:29 +0000 | |
| commit | 79f5d3f4fc36a0dc5f7b1e2deca89404a4bbef35 (patch) | |
| tree | e16d294739202942e25c40c8d1b8b3256b7cc3d2 | |
| parent | 50a503bdf775cdb51d753c64bc5defa8fac72671 (diff) | |
| parent | 3bec57aa03aec15132963a40adf4cf3fefb1afb9 (diff) | |
Merge "Make AudioManager.getSurroundFormats a TestApi" into sc-dev
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioManager.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 2bae1907daec..45dcb1770008 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1405,6 +1405,7 @@ package android.media { method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int abandonAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String); method @Nullable public static android.media.AudioDeviceInfo getDeviceInfoFromType(int); method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFadeOutDurationOnFocusLossMillis(@NonNull android.media.AudioAttributes); + method @NonNull public java.util.Map<java.lang.Integer,java.lang.Boolean> getSurroundFormats(); method public boolean hasRegisteredDynamicPolicy(); method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.QUERY_AUDIO_STATE}) public boolean isFullVolumeDevice(); method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int requestAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String, int, int); diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index b7d5c7b21175..b7ea14ecd5d6 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -7055,6 +7055,8 @@ public class AudioManager { * @return a map where the key is a surround format and * the value indicates the surround format is enabled or not */ + @TestApi + @NonNull public Map<Integer, Boolean> getSurroundFormats() { Map<Integer, Boolean> surroundFormats = new HashMap<>(); int status = AudioSystem.getSurroundFormats(surroundFormats); |