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

Commit 55dc0310 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Add ability to set whether audio route is allowed in... 

Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: b5450cb6
am: 3b6f9f78cf

* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
parents d022e4e5 b5450cb6

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+35 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,41 @@ public final class BluetoothHeadsetClient implements BluetoothProfile { 
        return BluetoothHeadsetClient.STATE_AUDIO_DISCONNECTED;

    }



    /**

     * Sets whether audio routing is allowed.

     *

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

     */

    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.

     *

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

     */

    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;

    }



    /**

     * Initiates a connection of audio channel.

     *

framework/java/android/bluetooth/IBluetoothHeadsetClient.aidl

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ interface IBluetoothHeadsetClient { 
    int getAudioState(in BluetoothDevice device);

    boolean connectAudio();

    boolean disconnectAudio();

    void setAudioRouteAllowed(boolean allowed);

    boolean getAudioRouteAllowed();



    Bundle getCurrentAgFeatures(in BluetoothDevice device);

}