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

Commit 5595b34e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix potenial NPE in PhonePolicy"

parents ceba91f8 eb2e3473

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

+4 −3
Original line number Diff line number Diff line
@@ -387,9 +387,10 @@ class PhonePolicy { 
        switch (profileId) {

            case BluetoothProfile.HEADSET:

                HeadsetService hsService = mFactory.getHeadsetService();

                List<BluetoothDevice> deviceList = hsService.getConnectedDevices();

                if ((hsService != null) && (BluetoothProfile.PRIORITY_AUTO_CONNECT

                if ((hsService != null)

                        && (BluetoothProfile.PRIORITY_AUTO_CONNECT

                                   != hsService.getPriority(device))) {

                    List<BluetoothDevice> deviceList = hsService.getConnectedDevices();

                    adjustOtherHeadsetPriorities(hsService, deviceList);

                    hsService.setPriority(device, BluetoothProfile.PRIORITY_AUTO_CONNECT);

                }