diff options
Diffstat (limited to 'wifi/java/android/net')
| -rw-r--r-- | wifi/java/android/net/wifi/p2p/WifiP2pService.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/p2p/WifiP2pService.java b/wifi/java/android/net/wifi/p2p/WifiP2pService.java index c800182..806730c 100644 --- a/wifi/java/android/net/wifi/p2p/WifiP2pService.java +++ b/wifi/java/android/net/wifi/p2p/WifiP2pService.java @@ -897,7 +897,11 @@ public class WifiP2pService extends IWifiP2pManager.Stub { break; case WifiMonitor.P2P_DEVICE_LOST_EVENT: WifiP2pDevice device = (WifiP2pDevice) message.obj; - if (!mSavedPeerConfig.deviceAddress.equals(device.deviceAddress)) { + + // If we lose a device during an autonomous group creation, + // mSavedPeerConfig can be empty + if (mSavedPeerConfig != null && + !mSavedPeerConfig.deviceAddress.equals(device.deviceAddress)) { // Do the regular device lost handling ret = NOT_HANDLED; break; |