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

Commit e0642f0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support set active device to null." am: 5575901e am: 17c05666 

Change-Id: I80ab9d404dc486a2ea14b04400c760fab9bd007e
parents bb785f18 17c05666

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

+12 −9
Original line number Diff line number Diff line
@@ -2344,21 +2344,24 @@ public class AdapterService extends Service { 
                return false;

        }



        if (setA2dp && mA2dpService != null && mA2dpService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            Log.i(TAG, "setActiveDevice: Setting active A2dp device " + device.getAddress());

        if (setA2dp && mA2dpService != null && (device == null

                || mA2dpService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {

            Log.i(TAG, "setActiveDevice: Setting active A2dp device " + device);

            mA2dpService.setActiveDevice(device);

        }



        if (mHearingAidService != null && mHearingAidService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            Log.i(TAG, "setActiveDevice: Setting active Hearing Aid " + device.getAddress());

        if (mHearingAidService != null && (device == null

                || mHearingAidService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {

            Log.i(TAG, "setActiveDevice: Setting active Hearing Aid " + device);

            mHearingAidService.setActiveDevice(device);

        }



        if (setHeadset && mHeadsetService != null && mHeadsetService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {

            Log.i(TAG, "setActiveDevice: Setting active Headset " + device.getAddress());

        if (setHeadset && mHeadsetService != null && (device == null

                || mHeadsetService.getConnectionPolicy(device)

                == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {

            Log.i(TAG, "setActiveDevice: Setting active Headset " + device);

            mHeadsetService.setActiveDevice(device);

        }