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

Commit 151a508d authored by weichinweng's avatar weichinweng Committed by Weichin Weng
Browse files

Add null check when receiving PAN connection state changed 

In some corner cases, when the Bluetooth is turning off, getDevice will
return null since mAdapter is null. Add null check when receiving PAN
connection state changed.

Bug: 150522777
Test: atest BluetoothInstrumentationTests
Tag: #stability

Change-Id: Ifc0ca5d505febaae7e1bfae63dc69743fc4ece37
parent 531982f9

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);

                }