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

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

Merge "Add null check when receiving PAN connection state changed" am:... 

Merge "Add null check when receiving PAN connection state changed" am: 7f159433 am: d34a7cf3 am: 95268919

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

Change-Id: I11baff8f8ad8052660cfaff9ba2d00a0b4c8a202
parents 52b6c086 95268919

src/com/android/bluetooth/pan/PanService.java

+6 −1
Original line number Diff line number Diff line
@@ -206,12 +206,17 @@ public class PanService extends ProfileService { 
                break;

                case MESSAGE_CONNECT_STATE_CHANGED: {

                    ConnectState cs = (ConnectState) msg.obj;

                    BluetoothDevice device = getDevice(cs.addr);

                    final BluetoothDevice device = getDevice(cs.addr);

                    // TBD get iface from the msg

                    if (DBG) {

                        Log.d(TAG,

                                "MESSAGE_CONNECT_STATE_CHANGED: " + device + " state: " + cs.state);

                    }

                    // It could be null if the connection up is coming when the Bluetooth is turning

                    // off.

                    if (device == null) {

                        break;

                    }

                    handlePanDeviceStateChange(device, mPanIfName /* iface */,

                            convertHalState(cs.state), cs.local_role, cs.remote_role);

                }