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

Commit e0ac9dab authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio: deprecate AudioManager.isBluetoothA2dpOn()"

parents 1534b978 c117bea6

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -20725,7 +20725,7 @@ package android.media { 
    method public int getStreamMaxVolume(int);

    method public int getStreamVolume(int);

    method public deprecated int getVibrateSetting(int);

    method public boolean isBluetoothA2dpOn();

    method public deprecated boolean isBluetoothA2dpOn();

    method public boolean isBluetoothScoAvailableOffCall();

    method public boolean isBluetoothScoOn();

    method public boolean isMicrophoneMute();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22339,7 +22339,7 @@ package android.media { 
    method public int getStreamMaxVolume(int);

    method public int getStreamVolume(int);

    method public deprecated int getVibrateSetting(int);

    method public boolean isBluetoothA2dpOn();

    method public deprecated boolean isBluetoothA2dpOn();

    method public boolean isBluetoothScoAvailableOffCall();

    method public boolean isBluetoothScoOn();

    method public boolean isHdmiSystemAudioSupported();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -20818,7 +20818,7 @@ package android.media { 
    method public int getStreamMaxVolume(int);

    method public int getStreamVolume(int);

    method public deprecated int getVibrateSetting(int);

    method public boolean isBluetoothA2dpOn();

    method public deprecated boolean isBluetoothA2dpOn();

    method public boolean isBluetoothScoAvailableOffCall();

    method public boolean isBluetoothScoOn();

    method public boolean isMicrophoneMute();

media/java/android/media/AudioManager.java

+4 −3
Original line number Diff line number Diff line
@@ -1456,10 +1456,11 @@ public class AudioManager { 
    }



    /**

     * Checks whether A2DP audio routing to the Bluetooth headset is on or off.

     * Checks whether a Bluetooth A2DP audio peripheral is connected or not.

     *

     * @return true if A2DP audio is being routed to/from Bluetooth headset;

     * @return true if a Bluetooth A2DP peripheral is connected

     *         false if otherwise

     * @deprecated Use {@link AudioManager#getDevices(int)} instead to list available audio devices.

     */

    public boolean isBluetoothA2dpOn() {

        if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_BLUETOOTH_A2DP,"")
@@ -1492,7 +1493,7 @@ public class AudioManager { 
     *

     * @return true if a wired headset is connected.

     *         false if otherwise

     * @deprecated Use only to check is a headset is connected or not.

     * @deprecated Use {@link AudioManager#getDevices(int)} instead to list available audio devices.

     */

    public boolean isWiredHeadsetOn() {

        if (AudioSystem.getDeviceConnectionState(DEVICE_OUT_WIRED_HEADSET,"")