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

Commit 0db53d90 authored by Bryce Lee's avatar Bryce Lee
Browse files

Add Bluetooth headset API to allow disabling audio route. 

This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.

Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
parent e6538dcc

core/java/android/bluetooth/BluetoothHeadset.java

+42 −0
Original line number Original line Diff line number Diff line
@@ -684,6 +684,48 @@ public final class BluetoothHeadset implements BluetoothProfile { 
        return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;

        return BluetoothHeadset.STATE_AUDIO_DISCONNECTED;

    }

    }





    /**

     * Sets whether audio routing is allowed. When set to {@code false}, the AG will not route any

     * audio to the HF unless explicitly told to.

     * This method should be used in cases where the SCO channel is shared between multiple profiles

     * and must be delegated by a source knowledgeable

     * Note: This is an internal function and shouldn't be exposed

     *

     * @param allowed {@code true} if the profile can reroute audio, {@code false} otherwise.

     *

     * @hide

     */

    public void setAudioRouteAllowed(boolean allowed) {

        if (VDBG) log("setAudioRouteAllowed");

        if (mService != null && isEnabled()) {

            try {

                mService.setAudioRouteAllowed(allowed);

            } catch (RemoteException e) {Log.e(TAG, e.toString());}

        } else {

            Log.w(TAG, "Proxy not attached to service");

            if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));

        }

    }



    /**

     * Returns whether audio routing is allowed. see {@link #setAudioRouteAllowed(boolean)}.

     * Note: This is an internal function and shouldn't be exposed

     *

     * @hide

     */

    public boolean getAudioRouteAllowed() {

        if (VDBG) log("getAudioRouteAllowed");

        if (mService != null && isEnabled()) {

            try {

                return mService.getAudioRouteAllowed();

            } catch (RemoteException e) {Log.e(TAG, e.toString());}

        } else {

            Log.w(TAG, "Proxy not attached to service");

            if (DBG) Log.d(TAG, Log.getStackTraceString(new Throwable()));

        }

        return false;

    }



    /**

    /**

     * Check if Bluetooth SCO audio is connected.

     * Check if Bluetooth SCO audio is connected.

     *

     *

core/java/android/bluetooth/IBluetoothHeadset.aidl

+2 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,8 @@ interface IBluetoothHeadset { 
    boolean isAudioOn();

    boolean isAudioOn();

    boolean connectAudio();

    boolean connectAudio();

    boolean disconnectAudio();

    boolean disconnectAudio();

    void setAudioRouteAllowed(boolean allowed);

    boolean getAudioRouteAllowed();

    boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);

    boolean startScoUsingVirtualVoiceCall(in BluetoothDevice device);

    boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);

    boolean stopScoUsingVirtualVoiceCall(in BluetoothDevice device);

    void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);

    void phoneStateChanged(int numActive, int numHeld, int callState, String number, int type);