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

Commit 0bbdcba7 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Automerger Merge Worker
Browse files

Merge "Make AudioManager.getSurroundFormats a TestApi" into sc-dev am: 79f5d3f4 am: e6f77d35 

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

Change-Id: I954d0df00971f838d65c728492914b1d0e6026e2
parents f65edd6b e6f77d35

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

media/java/android/media/AudioManager.java

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