diff --git a/core/api/current.txt b/core/api/current.txt index 4b12d54c5a576..51867b98b3959 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -20379,7 +20379,7 @@ package android.media { method @NonNull public java.util.List 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 getMicrophones() throws java.io.IOException; method public int getMode(); method public String getParameters(String); @@ -20402,7 +20402,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(); diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 85d1bc533401b..4dc1cca9848d7 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -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);