commit 1b3dcd3bda605d766da64b48b22bb96a875e728a
author Irfan Sheriff <isheriff@google.com> Fri Jun 01 13:38:10 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 01 13:38:10 2012 -0700
tree 3ff82642e5e1e2fc57565da345ab37f0a0bd99f7
parent 79f7381f8b4e9a462d012740c2a902ae3de8a6b0
parent ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d

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

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

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