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

Commit 7714f9a1 authored by weichinweng's avatar weichinweng
Browse files

Support set active device to null. 

Since some process will call removeActiveDevice for setting device to
null. But below current logic, if the device is null will skip the
action. The patch is that add check if the deivce is null, will directly
set the active to null.

Bug: 152581026
Test: Manual
Change-Id: Ib4c00d75e0de0581abf993469a029e02d36d608e
parent fcfd6a1f

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

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

        }