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

Commit fd85a0c7 authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

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

parents 41b21288 b7fe6a9a

core/api/current.txt

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

    method @NonNull public java.util.List<android.media.AudioDeviceInfo> getAvailableCommunicationDevices();

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

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

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

    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 java.util.List<android.media.MicrophoneInfo> getMicrophones() throws java.io.IOException;

    method public int getMode();

    method public int getMode();

    method public String getParameters(String);

    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 static boolean isOffloadedPlaybackSupported(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);

    method public boolean isSpeakerphoneOn();

    method public boolean isSpeakerphoneOn();

    method public boolean isStreamMute(int);

    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 public boolean isVolumeFixed();

    method @Deprecated public boolean isWiredHeadsetOn();

    method @Deprecated public boolean isWiredHeadsetOn();

    method public void loadSoundEffects();

    method public void loadSoundEffects();

media/java/android/media/AudioManager.java

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

     *

     * @return true if successful, otherwise false

     * @return true if successful, otherwise false

     */

     */

    @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS)

    public @EncodedSurroundOutputMode int getEncodedSurroundMode() {

    public @EncodedSurroundOutputMode int getEncodedSurroundMode() {

        try {

        try {

            return getService().getEncodedSurroundMode(

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

     *

     * @return whether the required surround format is enabled

     * @return whether the required surround format is enabled

     */

     */

    @RequiresPermission(android.Manifest.permission.WRITE_SETTINGS)

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

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

        try {

        try {

            return getService().isSurroundFormatEnabled(audioFormat);

            return getService().isSurroundFormatEnabled(audioFormat);