From ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Fri, 1 Jun 2012 12:37:11 -0700 Subject: Fix NPE while creating autonomous GO When autonomous GO is being created and we get a device lost event, fix NPE Bug: 6595978 Change-Id: Id93b693b8bcc447aea03c04be7556b1f2ff00a90 --- wifi/java/android/net/wifi/p2p/WifiP2pService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wifi') 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; -- cgit v1.1