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

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

Merge "Removing permission requirements from surround sound setting getter... 

Merge "Removing permission requirements from surround sound setting getter APIs" into sc-dev am: fd85a0c7

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

Change-Id: Icc4fd9841253a3c2cbf7772d15ed2f17d56fd943
parents 5760bf1a fd85a0c7

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -20380,7 +20380,7 @@ package android.media { 
    method @NonNull public java.util.List<android.media.AudioDeviceInfo> getAvailableCommunicationDevices();

    method @Nullable public android.media.AudioDeviceInfo getCommunicationDevice();

    method public android.media.AudioDeviceInfo[] getDevices(int);

    method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public int getEncodedSurroundMode();

    method public int getEncodedSurroundMode();

    method public java.util.List<android.media.MicrophoneInfo> getMicrophones() throws java.io.IOException;

    method public int getMode();

    method public String getParameters(String);
@@ -20403,7 +20403,7 @@ package android.media { 
    method public static boolean isOffloadedPlaybackSupported(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);

    method public boolean isSpeakerphoneOn();

    method public boolean isStreamMute(int);

    method @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS) public boolean isSurroundFormatEnabled(int);

    method public boolean isSurroundFormatEnabled(int);

    method public boolean isVolumeFixed();

    method @Deprecated public boolean isWiredHeadsetOn();

    method public void loadSoundEffects();

media/java/android/media/AudioManager.java

+0 −2
Original line number Diff line number Diff line
@@ -6887,7 +6887,6 @@ public class AudioManager { 
     *

     * @return true if successful, otherwise false

     */

    @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS)

    public @EncodedSurroundOutputMode int getEncodedSurroundMode() {

        try {

            return getService().getEncodedSurroundMode(
@@ -6944,7 +6943,6 @@ public class AudioManager { 
     *

     * @return whether the required surround format is enabled

     */

    @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS)

    public boolean isSurroundFormatEnabled(@AudioFormat.SurroundSoundEncoding int audioFormat) {

        try {

            return getService().isSurroundFormatEnabled(audioFormat);