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

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

Merge "Support set active device to null." am: 2ab71c29 am: 229f13b1 

Change-Id: Iad70848f638877a829926a87d04dbead1edf63f4
parents 7ed8331c 229f13b1

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

+12 −9
Original line number Diff line number Diff line
@@ -2369,21 +2369,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);

        }