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

Commit 044a5f51 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev

parents 6b45642f 0daab220

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -14135,7 +14135,6 @@ package android.media { 
    method public deprecated void setWiredHeadsetOn(boolean);

    method public deprecated boolean shouldVibrate(int);

    method public void startBluetoothSco();

    method public void startBluetoothScoVirtualCall();

    method public void stopBluetoothSco();

    method public void unloadSoundEffects();

    method public void unregisterMediaButtonEventReceiver(android.content.ComponentName);

media/java/android/media/AudioManager.java

+4 −4
Original line number Diff line number Diff line
@@ -1341,6 +1341,7 @@ public class AudioManager { 
    }



    /**

     * @hide

     * Start bluetooth SCO audio connection in virtual call mode.

     * <p>Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.
@@ -1368,12 +1369,11 @@ public class AudioManager { 
     * <p>Requires Permission:

     *   {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS}.

     * <p>This method must be called by applications having requested the use of

     * bluetooth SCO audio with {@link #startBluetoothSco()} or

     * {@link #startBluetoothScoVirtualCall()} when finished with the SCO connection or

     * if connection fails.

     * bluetooth SCO audio with {@link #startBluetoothSco()} when finished with the SCO

     * connection or if connection fails.

     * @see #startBluetoothSco()

     * @see #startBluetoothScoVirtualCall()

     */

    // Also used for connections started with {@link #startBluetoothScoVirtualCall()}

    public void stopBluetoothSco(){

        IAudioService service = getService();

        try {