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

Commit db1afeb8 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Do not auto activate A2DP or HFP when the other profile activated 

There are some chances that the followings happen:
(1) The activation of BT1's A2DP activate BT1's HFP
(2) Bofore BT1's HFP is activated, set BT2's A2DP active
(3) The activation of BT2's A2DP activate BT2's HFP
(4) When BT1's HFP connected by (1), it activate BT1's A2DP again

In this case, even the user activates BT2's A2DP, BT1's A2DP could be activated.

Bug: 286501295
Test: atest BluetoothInstrumentationTests:ActiveDeviceManagerTest
Change-Id: I926db7ddb97a105558e543eee1550d8c6ba60e70
parent 50baddb7

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+81 −21
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ class ActiveDeviceManager { 
    static final int A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS = 5_000;



    private final AdapterService mAdapterService;

    private DatabaseManager mDbManager;

    private final ServiceFactory mFactory;

    private HandlerThread mHandlerThread = null;

    private Handler mHandler = null;
@@ -153,6 +154,9 @@ class ActiveDeviceManager { 
    @GuardedBy("mLock")

    private BluetoothDevice mPendingActiveDevice = null;



    private BluetoothDevice mClassicDeviceToBeActivated = null;

    private BluetoothDevice mClassicDeviceNotToBeActivated = null;



    // Broadcast receiver for all changes

    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override
@@ -281,8 +285,7 @@ class ActiveDeviceManager { 
                    return;

                }

                // Activate A2DP if audio mode is normal or HFP is not supported or enabled.

                DatabaseManager dbManager = mAdapterService.getDatabase();

                if (dbManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET)

                if (mDbManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET)

                                != BluetoothProfile.CONNECTION_POLICY_ALLOWED

                        || mAudioManager.getMode() == AudioManager.MODE_NORMAL) {

                    boolean a2dpMadeActive = setA2dpActiveDevice(device);
@@ -348,8 +351,7 @@ class ActiveDeviceManager { 
                    return;

                }

                // Activate HFP if audio mode is not normal or A2DP is not supported or enabled.

                DatabaseManager dbManager = mAdapterService.getDatabase();

                if (dbManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP)

                if (mDbManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP)

                                != BluetoothProfile.CONNECTION_POLICY_ALLOWED

                        || mAudioManager.getMode() != AudioManager.MODE_NORMAL) {

                    if (isWatch(device)) {
@@ -583,11 +585,42 @@ class ActiveDeviceManager { 
                    setLeAudioActiveDevice(null, true);

                }

            }

            if (mHfpConnectedDevices.contains(device)) {

                setHfpActiveDevice(device);

            }

            // Just assign locally the new value

            mA2dpActiveDevice = device;



            // Activate HFP if needed.

            if (device != null) {

                if (Objects.equals(mClassicDeviceNotToBeActivated, device)) {

                    mHandler.removeCallbacksAndMessages(mClassicDeviceNotToBeActivated);

                    mClassicDeviceNotToBeActivated = null;

                    return;

                }

                if (Objects.equals(mClassicDeviceToBeActivated, device)) {

                    mHandler.removeCallbacksAndMessages(mClassicDeviceToBeActivated);

                    mClassicDeviceToBeActivated = null;

                }



                if (mClassicDeviceToBeActivated != null) {

                    mClassicDeviceNotToBeActivated = mClassicDeviceToBeActivated;

                    mHandler.removeCallbacksAndMessages(mClassicDeviceToBeActivated);

                    mHandler.postDelayed(

                            () -> mClassicDeviceNotToBeActivated = null,

                            mClassicDeviceNotToBeActivated,

                            A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS);

                    mClassicDeviceToBeActivated = null;

                }

                if (!Objects.equals(mHfpActiveDevice, device)

                        && mHfpConnectedDevices.contains(device)

                        && mDbManager.getProfileConnectionPolicy(device, BluetoothProfile.HEADSET)

                                == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

                    mClassicDeviceToBeActivated = device;

                    setHfpActiveDevice(device);

                    mHandler.postDelayed(

                            () -> mClassicDeviceToBeActivated = null,

                            mClassicDeviceToBeActivated,

                            A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS);

                }

            }

        }

    }
@@ -618,11 +651,42 @@ class ActiveDeviceManager { 
                    setLeAudioActiveDevice(null, true);

                }

            }

            if (mA2dpConnectedDevices.contains(device)) {

                setA2dpActiveDevice(device);

            }

            // Just assign locally the new value

            mHfpActiveDevice = device;



            // Activate A2DP if needed.

            if (device != null) {

                if (Objects.equals(mClassicDeviceNotToBeActivated, device)) {

                    mHandler.removeCallbacksAndMessages(mClassicDeviceNotToBeActivated);

                    mClassicDeviceNotToBeActivated = null;

                    return;

                }

                if (Objects.equals(mClassicDeviceToBeActivated, device)) {

                    mHandler.removeCallbacksAndMessages(mClassicDeviceToBeActivated);

                    mClassicDeviceToBeActivated = null;

                }



                if (mClassicDeviceToBeActivated != null) {

                    mClassicDeviceNotToBeActivated = mClassicDeviceToBeActivated;

                    mHandler.removeCallbacksAndMessages(mClassicDeviceToBeActivated);

                    mHandler.postDelayed(

                            () -> mClassicDeviceNotToBeActivated = null,

                            mClassicDeviceNotToBeActivated,

                            A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS);

                    mClassicDeviceToBeActivated = null;

                }

                if (!Objects.equals(mA2dpActiveDevice, device)

                        && mA2dpConnectedDevices.contains(device)

                        && mDbManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP)

                                == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

                    mClassicDeviceToBeActivated = device;

                    setA2dpActiveDevice(device);

                    mHandler.postDelayed(

                            () -> mClassicDeviceToBeActivated = null,

                            mClassicDeviceToBeActivated,

                            A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS);

                }

            }

        }

    }
@@ -721,6 +785,7 @@ class ActiveDeviceManager { 


    ActiveDeviceManager(AdapterService service, ServiceFactory factory) {

        mAdapterService = service;

        mDbManager = mAdapterService.getDatabase();

        mFactory = factory;

        mAudioManager = service.getSystemService(AudioManager.class);

        mAudioManagerAudioDeviceCallback = new AudioManagerAudioDeviceCallback();
@@ -948,10 +1013,7 @@ class ActiveDeviceManager { 
        if (DBG) {

            Log.d(TAG, "setFallbackDeviceActive");

        }

        DatabaseManager dbManager = mAdapterService.getDatabase();

        if (dbManager == null) {

            return false;

        }

        mDbManager = mAdapterService.getDatabase();

        List<BluetoothDevice> connectedHearingAidDevices = new ArrayList<>();

        if (!mHearingAidConnectedDevices.isEmpty()) {

            connectedHearingAidDevices.addAll(mHearingAidConnectedDevices);
@@ -961,7 +1023,7 @@ class ActiveDeviceManager { 
        }

        if (!connectedHearingAidDevices.isEmpty()) {

            BluetoothDevice device =

                    dbManager.getMostRecentlyConnectedDevicesInList(connectedHearingAidDevices);

                    mDbManager.getMostRecentlyConnectedDevicesInList(connectedHearingAidDevices);

            if (device != null) {

                if (mHearingAidConnectedDevices.contains(device)) {

                    if (DBG) {
@@ -1014,7 +1076,7 @@ class ActiveDeviceManager { 
                    connectedDevices.add(headsetFallbackDevice);

                }

        }

        BluetoothDevice device = dbManager.getMostRecentlyConnectedDevicesInList(connectedDevices);

        BluetoothDevice device = mDbManager.getMostRecentlyConnectedDevicesInList(connectedDevices);

        if (device != null) {

            if (mAudioManager.getMode() == AudioManager.MODE_NORMAL) {

                if (Objects.equals(a2dpFallbackDevice, device)) {
@@ -1150,9 +1212,7 @@ class ActiveDeviceManager { 
        }



        // Check metadata

        DatabaseManager dbManager = mAdapterService.getDatabase();

        byte[] deviceType = dbManager.getCustomMeta(device,

            BluetoothDevice.METADATA_DEVICE_TYPE);

        byte[] deviceType = mDbManager.getCustomMeta(device, BluetoothDevice.METADATA_DEVICE_TYPE);

        if (deviceType == null) {

            return false;

        }

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −1
Original line number Diff line number Diff line
@@ -5176,7 +5176,6 @@ public class AdapterService extends Service { 
     *

     * @return {@link DatabaseManager} or null on error

     */

    @VisibleForTesting

    public DatabaseManager getDatabase() {

        return mDatabaseManager;

    }

android/app/src/com/android/bluetooth/btservice/storage/DatabaseManager.java

+0 −2
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ public class DatabaseManager { 
    /**

     * Get customized metadata from database with requested key

     */

    @VisibleForTesting

    public byte[] getCustomMeta(BluetoothDevice device, int key) {

        synchronized (mMetadataCache) {

            if (device == null) {
@@ -419,7 +418,6 @@ public class DatabaseManager { 
     * {@link BluetoothProfile.CONNECTION_POLICY_FORBIDDEN},

     * {@link BluetoothProfile.CONNECTION_POLICY_ALLOWED}

     */

    @VisibleForTesting

    public int getProfileConnectionPolicy(BluetoothDevice device, int profile) {

        synchronized (mMetadataCache) {

            if (device == null) {

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+194 −15
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.bluetooth.btservice;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.Mockito.after;

import static org.mockito.Mockito.any;
@@ -335,7 +337,6 @@ public class ActiveDeviceManagerTest { 
                .setActiveDevice(mA2dpHeadsetDevice);

    }





    @Test

    public void headsetConnectedButA2dpNotConnected_setHeadsetActive() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);
@@ -345,6 +346,190 @@ public class ActiveDeviceManagerTest { 
                .setActiveDevice(mA2dpHeadsetDevice);

    }



    @Test

    public void hfpActivatedAfterA2dpActivated_shouldNotActivateA2dpAgain() {

        a2dpConnected(mA2dpHeadsetDevice, true);

        a2dpConnected(mSecondaryAudioDevice, true);

        headsetConnected(mA2dpHeadsetDevice, true);

        headsetConnected(mSecondaryAudioDevice, true);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);



        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // When A2DP is activated, then it should activate HFP

        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mHeadsetService).setActiveDevice(mA2dpHeadsetDevice);



        // If HFP activated already, it should not activate A2DP again

        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mA2dpService, never()).setActiveDevice(mA2dpHeadsetDevice);

    }



    @Test

    public void hfpActivatedAfterTimeout_shouldActivateA2dpAgain() {

        a2dpConnected(mA2dpHeadsetDevice, true);

        headsetConnected(mA2dpHeadsetDevice, true);

        a2dpActiveDeviceChanged(null);

        headsetActiveDeviceChanged(null);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // When A2DP is activated, then it should activate HFP

        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        verify(mA2dpService, after(A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS).never())

                .setActiveDevice(any());

        verify(mHeadsetService).setActiveDevice(mA2dpHeadsetDevice);



        a2dpActiveDeviceChanged(null);

        // When HFP activated after timeout, it should activate A2DP again

        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);

    }



    @Test

    public void a2dpHeadsetActivated_whileActivatingAnotherA2dpHeadset() {

        a2dpConnected(mA2dpHeadsetDevice, true);

        a2dpConnected(mSecondaryAudioDevice, true);

        headsetConnected(mA2dpHeadsetDevice, true);

        headsetConnected(mSecondaryAudioDevice, true);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);



        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // Test HS1 A2DP -> HS2 A2DP -> HS1 HFP -> HS2 HFP

        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mHeadsetService).setActiveDevice(mA2dpHeadsetDevice);



        a2dpActiveDeviceChanged(mSecondaryAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        verify(mHeadsetService).setActiveDevice(mSecondaryAudioDevice);



        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mA2dpService, never()).setActiveDevice(any());



        headsetActiveDeviceChanged(mSecondaryAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        verify(mA2dpService, never()).setActiveDevice(any());



        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // Test HS1 HFP -> HS2 HFP -> HS1 A2DP -> HS2 A2DP

        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);



        headsetActiveDeviceChanged(mSecondaryAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        verify(mA2dpService).setActiveDevice(mSecondaryAudioDevice);



        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        verify(mHeadsetService, never()).setActiveDevice(any());



        a2dpActiveDeviceChanged(mSecondaryAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mSecondaryAudioDevice);

        verify(mHeadsetService, never()).setActiveDevice(any());



        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);

    }



    @Test

    public void hfpActivated_whileActivatingA2dpHeadset() {

        headsetConnected(mHeadsetDevice, false);

        a2dpConnected(mA2dpHeadsetDevice, true);

        headsetConnected(mA2dpHeadsetDevice, true);

        a2dpActiveDeviceChanged(null);

        headsetActiveDeviceChanged(null);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // Test HS1 HFP -> HFP only -> HS1 A2DP

        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);



        headsetActiveDeviceChanged(mHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mHeadsetDevice);

        verify(mA2dpService, never()).setActiveDevice(mHeadsetDevice);



        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mHeadsetDevice);

        verify(mHeadsetService, never()).setActiveDevice(any());

    }



    @Test

    public void a2dpActivated_whileActivatingA2dpHeadset() {

        a2dpConnected(mA2dpDevice, false);

        a2dpConnected(mA2dpHeadsetDevice, true);

        headsetConnected(mA2dpHeadsetDevice, true);

        a2dpActiveDeviceChanged(null);

        headsetActiveDeviceChanged(null);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        Mockito.clearInvocations(mHeadsetService);

        Mockito.clearInvocations(mA2dpService);



        // Test HS1 HFP -> A2DP only -> HS1 A2DP

        headsetActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mA2dpService).setActiveDevice(mA2dpHeadsetDevice);



        a2dpActiveDeviceChanged(mA2dpDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mHeadsetService, never()).setActiveDevice(mA2dpDevice);



        a2dpActiveDeviceChanged(mA2dpHeadsetDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getA2dpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        assertThat(mActiveDeviceManager.getHfpActiveDevice()).isEqualTo(mA2dpHeadsetDevice);

        verify(mHeadsetService, never()).setActiveDevice(any());

    }



    /**

     * A headset device with connecting audio policy set to NOT ALLOWED.

     */
@@ -986,9 +1171,7 @@ public class ActiveDeviceManagerTest { 
        mActiveDeviceManager.getBroadcastReceiver().onReceive(mContext, intent);

    }



    /**

     * Helper to indicate A2dp active device changed for a device.

     */

    /** Helper to indicate A2dp active device changed for a device. */

    private void a2dpActiveDeviceChanged(BluetoothDevice device) {

        mDeviceConnectionStack.remove(device);

        mDeviceConnectionStack.add(device);
@@ -999,9 +1182,7 @@ public class ActiveDeviceManagerTest { 
        mActiveDeviceManager.getBroadcastReceiver().onReceive(mContext, intent);

    }



    /**

     * Helper to indicate Headset connected for a device.

     */

    /** Helper to indicate Headset connected for a device. */

    private void headsetConnected(BluetoothDevice device, boolean supportA2dp) {

        mDatabaseManager.setProfileConnectionPolicy(

                device,
@@ -1020,13 +1201,13 @@ public class ActiveDeviceManagerTest { 
        mActiveDeviceManager.getBroadcastReceiver().onReceive(mContext, intent);

    }



    /**

     * Helper to indicate Headset disconnected for a device.

     */

    /** Helper to indicate Headset disconnected for a device. */

    private void headsetDisconnected(BluetoothDevice device) {

        mDeviceConnectionStack.remove(device);

        mMostRecentDevice = (mDeviceConnectionStack.size() > 0)

                ? mDeviceConnectionStack.get(mDeviceConnectionStack.size() - 1) : null;

        mMostRecentDevice =

                (mDeviceConnectionStack.size() > 0)

                        ? mDeviceConnectionStack.get(mDeviceConnectionStack.size() - 1)

                        : null;



        Intent intent = new Intent(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device);
@@ -1035,9 +1216,7 @@ public class ActiveDeviceManagerTest { 
        mActiveDeviceManager.getBroadcastReceiver().onReceive(mContext, intent);

    }



    /**

     * Helper to indicate Headset active device changed for a device.

     */

    /** Helper to indicate Headset active device changed for a device. */

    private void headsetActiveDeviceChanged(BluetoothDevice device) {

        mDeviceConnectionStack.remove(device);

        mDeviceConnectionStack.add(device);