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

Commit 9841818b authored by Mike Lockwood's avatar Mike Lockwood
Browse files

AudioService: Fix problem handling USB audio disconnect 



Also broadcast ACTION_AUDIO_BECOMING_NOISY on USB audio disconnect

Change-Id: I46dfcc744df880066aea6bf651334a081c14af0f
Signed-off-by: default avatarMike Lockwood <lockwood@google.com>
parent bf910468

media/java/android/media/AudioService.java

+12 −5
Original line number Diff line number Diff line
@@ -2887,10 +2887,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
                address);

    }



    private void sendBecomingNoisyIntent() {

        mContext.sendBroadcast(new Intent(AudioManager.ACTION_AUDIO_BECOMING_NOISY));

    }



    // must be called synchronized on mConnectedDevices

    private void makeA2dpDeviceUnavailableNow(String address) {

        Intent noisyIntent = new Intent(AudioManager.ACTION_AUDIO_BECOMING_NOISY);

        mContext.sendBroadcast(noisyIntent);

        sendBecomingNoisyIntent();

        AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                AudioSystem.DEVICE_STATE_UNAVAILABLE,

                address);
@@ -2967,12 +2970,12 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
    private boolean handleDeviceConnection(boolean connected, int device, String params) {

        synchronized (mConnectedDevices) {

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

                    mConnectedDevices.get(device).equals(params));

                    (params.isEmpty() || mConnectedDevices.get(device).equals(params)));



            if (isConnected && !connected) {

                AudioSystem.setDeviceConnectionState(device,

                                              AudioSystem.DEVICE_STATE_UNAVAILABLE,

                                              params);

                                              mConnectedDevices.get(device));

                 mConnectedDevices.remove(device);

                 return true;

            } else if (!isConnected && connected) {
@@ -3093,9 +3096,13 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
            } else if (action.equals(Intent.ACTION_USB_AUDIO_ACCESSORY_PLUG) ||

                           action.equals(Intent.ACTION_USB_AUDIO_DEVICE_PLUG)) {

                state = intent.getIntExtra("state", 0);

                if (state == 0) {

                    sendBecomingNoisyIntent();

                }

                int alsaCard = intent.getIntExtra("card", -1);

                int alsaDevice = intent.getIntExtra("device", -1);

                String params = "card=" + alsaCard + ";device=" + alsaDevice;

                String params = (alsaCard == -1 && alsaDevice == -1 ? ""

                                    : "card=" + alsaCard + ";device=" + alsaDevice);

                device = action.equals(Intent.ACTION_USB_AUDIO_ACCESSORY_PLUG) ?

                        AudioSystem.DEVICE_OUT_USB_ACCESSORY : AudioSystem.DEVICE_OUT_USB_DEVICE;

                Log.v(TAG, "Broadcast Receiver: Got "