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

Commit d5603c12 authored by Eric Laurent's avatar Eric Laurent
Browse files

AudioService now differentiates BT headsets and car kits. 

The BT headset detection now makes the difference between car kits and headsets, which can be used by audio policy manager.
The headset connection is also detected earlier, that is when the headset is connected and not when the SCO socket is connected as it was the case before. This allows the audio policy manager to suspend A2DP output while ringing if a SCO headset is connected.
parent 44495b71

libs/audioflinger/AudioFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ void AudioFlinger::ThreadBase::processConfigEvents() 


AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinger, AudioStreamOut* output)

    :   ThreadBase(audioFlinger),

        mMixBuffer(0), mSuspended(false), mBytesWritten(0), mOutput(output),

        mMixBuffer(0), mSuspended(0), mBytesWritten(0), mOutput(output),

        mLastWriteTime(0), mNumWrites(0), mNumDelayedWrites(0), mInWrite(false)

{

    readOutputParameters();

libs/audioflinger/AudioFlinger.h

+3 −3
Original line number Diff line number Diff line
@@ -502,8 +502,8 @@ private: 
                    AudioStreamOut* getOutput() { return mOutput; }



        virtual     int         type() const { return mType; }

                    void        suspend() { mSuspended = true; }

                    void        restore() { mSuspended = false; }

                    void        suspend() { mSuspended++; }

                    void        restore() { if (mSuspended) mSuspended--; }

        virtual     String8     getParameters(const String8& keys);

        virtual     void        audioConfigChanged(int event, int param = 0);
@@ -520,7 +520,7 @@ private: 
    protected:

        int                             mType;

        int16_t*                        mMixBuffer;

        bool                            mSuspended;

        int                             mSuspended;

        int                             mBytesWritten;

        bool                            mMasterMute;

        SortedVector< wp<Track> >       mActiveTracks;

media/java/android/media/AudioService.java

+49 −14
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import android.bluetooth.BluetoothIntent; 
import android.content.BroadcastReceiver;

import android.bluetooth.BluetoothHeadset;

import android.bluetooth.BluetoothA2dp;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BluetoothClass;



import android.content.pm.PackageManager;

import android.database.ContentObserver;
@@ -219,6 +221,8 @@ public class AudioService extends IAudioService.Stub { 
    // Forced device usage for communications

    private int mForcedUseForComm;



    private BluetoothDevice mBluetoothDevice = null;



    ///////////////////////////////////////////////////////////////////////////

    // Construction

    ///////////////////////////////////////////////////////////////////////////
@@ -243,7 +247,7 @@ public class AudioService extends IAudioService.Stub { 
        IntentFilter intentFilter =

                new IntentFilter(Intent.ACTION_HEADSET_PLUG);

        intentFilter.addAction(BluetoothA2dp.SINK_STATE_CHANGED_ACTION);

        intentFilter.addAction(BluetoothIntent.HEADSET_AUDIO_STATE_CHANGED_ACTION);

        intentFilter.addAction(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION);

        context.registerReceiver(mReceiver, intentFilter);

    }
@@ -756,9 +760,11 @@ public class AudioService extends IAudioService.Stub { 
    public void setBluetoothScoOn(boolean on){

        if (on) {

            AudioSystem.setForceUse(AudioSystem.FOR_COMMUNICATION, AudioSystem.FORCE_BT_SCO);

            AudioSystem.setForceUse(AudioSystem.FOR_RECORD, AudioSystem.FORCE_BT_SCO);

            mForcedUseForComm = AudioSystem.FORCE_BT_SCO;

        } else {

            AudioSystem.setForceUse(AudioSystem.FOR_COMMUNICATION, AudioSystem.FORCE_NONE);

            AudioSystem.setForceUse(AudioSystem.FOR_RECORD, AudioSystem.FORCE_NONE);

            mForcedUseForComm = AudioSystem.FORCE_NONE;

        }

    }
@@ -1257,8 +1263,9 @@ public class AudioService extends IAudioService.Stub { 
                    // Restore call state

                    AudioSystem.setPhoneState(mMode);



                    // Restore forced usage for communcations

                    // Restore forced usage for communcations and record

                    AudioSystem.setForceUse(AudioSystem.FOR_COMMUNICATION, mForcedUseForComm);

                    AudioSystem.setForceUse(AudioSystem.FOR_RECORD, mForcedUseForComm);



                    // Restore stream volumes

                    int numStreamTypes = AudioSystem.getNumStreamTypes();
@@ -1343,31 +1350,61 @@ public class AudioService extends IAudioService.Stub { 
                int state = intent.getIntExtra(BluetoothA2dp.SINK_STATE,

                                               BluetoothA2dp.STATE_DISCONNECTED);

                String address = intent.getStringExtra(BluetoothIntent.ADDRESS);

                if (state == BluetoothA2dp.STATE_DISCONNECTED) {



                boolean isConnected = (mConnectedDevices.containsKey(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP) &&

                                       ((String)mConnectedDevices.get(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP)).equals(address));



                if (isConnected &&

                    state != BluetoothA2dp.STATE_CONNECTED && state != BluetoothA2dp.STATE_PLAYING) {

                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                            AudioSystem.DEVICE_STATE_UNAVAILABLE,

                            address);

                    mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP);

                } else if (state == BluetoothA2dp.STATE_CONNECTED){

                } else if (!isConnected &&

                           (state == BluetoothA2dp.STATE_CONNECTED || state != BluetoothA2dp.STATE_PLAYING)){

                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                                                         AudioSystem.DEVICE_STATE_AVAILABLE,

                                                         address);

                    mConnectedDevices.put( new Integer(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP), address);

                }

            } else if (action.equals(BluetoothIntent.HEADSET_AUDIO_STATE_CHANGED_ACTION)) {

                int state = intent.getIntExtra(BluetoothIntent.HEADSET_AUDIO_STATE,

            } else if (action.equals(BluetoothIntent.HEADSET_STATE_CHANGED_ACTION)) {

                int state = intent.getIntExtra(BluetoothIntent.HEADSET_STATE,

                                               BluetoothHeadset.STATE_ERROR);

                String address = intent.getStringExtra(BluetoothIntent.ADDRESS);

                if (state == BluetoothHeadset.AUDIO_STATE_DISCONNECTED) {

                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_SCO,

                int device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;

                if (mBluetoothDevice == null) {

                    mBluetoothDevice = (BluetoothDevice)mContext.getSystemService(Context.BLUETOOTH_SERVICE);

                }

                if (mBluetoothDevice != null) {

                    int btClass = mBluetoothDevice.getRemoteClass(address);

                    if (BluetoothClass.Device.Major.getDeviceMajor(btClass) == BluetoothClass.Device.Major.AUDIO_VIDEO) {

                        switch (BluetoothClass.Device.getDevice(btClass)) {

                        case BluetoothClass.Device.AUDIO_VIDEO_WEARABLE_HEADSET:

                        case BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE:

                            device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;

                            break;

                        case BluetoothClass.Device.AUDIO_VIDEO_CAR_AUDIO:

                            device = AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_CARKIT;

                            break;

                        default:

                            break;

                        }

                    }

                }



                boolean isConnected = (mConnectedDevices.containsKey(device) &&

                                       ((String)mConnectedDevices.get(device)).equals(address));



                if (isConnected && state != BluetoothHeadset.STATE_CONNECTED) {

                    AudioSystem.setDeviceConnectionState(device,

                                                         AudioSystem.DEVICE_STATE_UNAVAILABLE,

                                                         address);

                    mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_SCO);

                } else if (state == BluetoothHeadset.AUDIO_STATE_CONNECTED) {

                    AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_SCO,

                    mConnectedDevices.remove(device);

                } else if (!isConnected && state == BluetoothHeadset.STATE_CONNECTED) {

                    AudioSystem.setDeviceConnectionState(device,

                                                         AudioSystem.DEVICE_STATE_AVAILABLE,

                                                         address);

                    mConnectedDevices.put( new Integer(AudioSystem.DEVICE_OUT_BLUETOOTH_SCO), address);

                    mConnectedDevices.put( new Integer(device), address);

                }

            } else if (action.equals(Intent.ACTION_HEADSET_PLUG)) {

                int state = intent.getIntExtra("state", 0);
@@ -1440,6 +1477,4 @@ public class AudioService extends IAudioService.Stub { 
            }

        }

    }





}