diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-06-02 08:20:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-02 08:20:32 -0700 |
| commit | b1ebee8ac7c96b48fb47e03a239d41edc376021b (patch) | |
| tree | f8dbbcef341a91fcf216294397b65c90bee3c5c8 /wifi | |
| parent | 50f4dca8caae00b02078df7adb3bef803583e638 (diff) | |
| parent | 7742b91c7e05c85801a03c36fb2f799703e82b9b (diff) | |
| download | frameworks_base-b1ebee8ac7c96b48fb47e03a239d41edc376021b.zip frameworks_base-b1ebee8ac7c96b48fb47e03a239d41edc376021b.tar.gz frameworks_base-b1ebee8ac7c96b48fb47e03a239d41edc376021b.tar.bz2 | |
am 7742b91c: am 1b3dcd3b: Merge "Fix NPE while creating autonomous GO" into jb-dev
* commit '7742b91c7e05c85801a03c36fb2f799703e82b9b':
Fix NPE while creating autonomous GO
Diffstat (limited to 'wifi')
| -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 72605c3..cf09bb4 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; |