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

Commit cbfde9f5 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Do not return null as active device" am: 1e33487f am: a5056425 am: 24c1b944 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2007022

Change-Id: Ifcf5fa7d7b4bc54f90a75b55f587aa7163a81d51
parents 710326b5 24c1b944

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

+11 −4
Original line number Original line Diff line number Diff line
@@ -859,6 +859,7 @@ public class AdapterService extends Service { 
            errorLog(

            errorLog(

                    "Cannot switch buffer size. The number of A2DP active devices is "

                    "Cannot switch buffer size. The number of A2DP active devices is "

                            + activeDevices.size());

                            + activeDevices.size());

            return;

        }

        }

        mA2dpService.switchCodecByBufferSize(activeDevices.get(0), isLowLatencyBufferSize);

        mA2dpService.switchCodecByBufferSize(activeDevices.get(0), isLowLatencyBufferSize);

    }

    }
@@ -4106,16 +4107,22 @@ public class AdapterService extends Service { 
                if (mHeadsetService == null) {

                if (mHeadsetService == null) {

                    Log.e(TAG, "getActiveDevices: HeadsetService is null");

                    Log.e(TAG, "getActiveDevices: HeadsetService is null");

                } else {

                } else {

                    activeDevices.add(mHeadsetService.getActiveDevice());

                    BluetoothDevice device = mHeadsetService.getActiveDevice();

                    Log.i(TAG, "getActiveDevices: Headset device: " + activeDevices.get(0));

                    if (device != null) {

                        activeDevices.add(device);

                    }

                    Log.i(TAG, "getActiveDevices: Headset device: " + device);

                }

                }

                break;

                break;

            case BluetoothProfile.A2DP:

            case BluetoothProfile.A2DP:

                if (mA2dpService == null) {

                if (mA2dpService == null) {

                    Log.e(TAG, "getActiveDevices: A2dpService is null");

                    Log.e(TAG, "getActiveDevices: A2dpService is null");

                } else {

                } else {

                    activeDevices.add(mA2dpService.getActiveDevice());

                    BluetoothDevice device = mA2dpService.getActiveDevice();

                    Log.i(TAG, "getActiveDevices: A2dp device: " + activeDevices.get(0));

                    if (device != null) {

                        activeDevices.add(device);

                    }

                    Log.i(TAG, "getActiveDevices: A2dp device: " + device);

                }

                }

                break;

                break;

            case BluetoothProfile.HEARING_AID:

            case BluetoothProfile.HEARING_AID: