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

Commit b4630c87 authored by Kriti Dang's avatar Kriti Dang Committed by Automerger Merge Worker
Browse files

Merge "Make AudioManager.getReportedSurroundFormats a TestApi" into sc-dev am: 0077afd8 

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

Change-Id: Ie9d1c4e039ce547eca7f3e427fa80a6fc08a963d
parents fa3e41dd 0077afd8

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,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.List<java.lang.Integer> getReportedSurroundFormats();

    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();

media/java/android/media/AudioManager.java

+11 −15
Original line number Diff line number Diff line
@@ -7062,14 +7062,11 @@ public class AudioManager { 
    @TestApi

    @NonNull

    public Map<Integer, Boolean> getSurroundFormats() {

        Map<Integer, Boolean> surroundFormats = new HashMap<>();

        int status = AudioSystem.getSurroundFormats(surroundFormats);

        if (status != AudioManager.SUCCESS) {

            // fail and bail!

            Log.e(TAG, "getSurroundFormats failed:" + status);

            return new HashMap<Integer, Boolean>(); // Always return a map.

        try {

            return getService().getSurroundFormats();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        return surroundFormats;

    }



    /**
@@ -7116,15 +7113,14 @@ public class AudioManager { 
     *

     * @return a list of surround formats

     */

    public ArrayList<Integer> getReportedSurroundFormats() {

        ArrayList<Integer> reportedSurroundFormats = new ArrayList<>();

        int status = AudioSystem.getReportedSurroundFormats(reportedSurroundFormats);

        if (status != AudioManager.SUCCESS) {

            // fail and bail!

            Log.e(TAG, "getReportedSurroundFormats failed:" + status);

            return new ArrayList<Integer>(); // Always return a list.

    @TestApi

    @NonNull

    public List<Integer> getReportedSurroundFormats() {

        try {

            return getService().getReportedSurroundFormats();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

        return reportedSurroundFormats;

    }



    /**

media/java/android/media/IAudioService.aidl

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ interface IAudioService { 


    oneway void reloadAudioSettings();



    Map getSurroundFormats();



    List getReportedSurroundFormats();



    boolean setSurroundFormatEnabled(int audioFormat, boolean enabled);



    boolean isSurroundFormatEnabled(int audioFormat);

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

+26 −0
Original line number Diff line number Diff line
@@ -1930,6 +1930,32 @@ public class AudioService extends IAudioService.Stub 
        }

    }



    /** @see AudioManager#getSurroundFormats() */

    @Override

    public Map<Integer, Boolean> getSurroundFormats() {

        Map<Integer, Boolean> surroundFormats = new HashMap<>();

        int status = AudioSystem.getSurroundFormats(surroundFormats);

        if (status != AudioManager.SUCCESS) {

            // fail and bail!

            Log.e(TAG, "getSurroundFormats failed:" + status);

            return new HashMap<>(); // Always return a map.

        }

        return surroundFormats;

    }



    /** @see AudioManager#getReportedSurroundFormats() */

    @Override

    public List<Integer> getReportedSurroundFormats() {

        ArrayList<Integer> reportedSurroundFormats = new ArrayList<>();

        int status = AudioSystem.getReportedSurroundFormats(reportedSurroundFormats);

        if (status != AudioManager.SUCCESS) {

            // fail and bail!

            Log.e(TAG, "getReportedSurroundFormats failed:" + status);

            return new ArrayList<>(); // Always return a list.

        }

        return reportedSurroundFormats;

    }



    /** @see AudioManager#isSurroundFormatEnabled(int) */

    @Override

    public boolean isSurroundFormatEnabled(int audioFormat) {