Merge "Fix NPE while creating autonomous GO" into jb-dev

Author: isheriff

wifi/java/android/net/wifi/p2p/WifiP2pService.java

@@ -897,7 +897,11 @@ public boolean processMessage(Message message) {
                     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;