diff options
| author | Irfan Sheriff <isheriff@google.com> | 2012-06-01 12:37:11 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2012-06-01 12:47:30 -0700 |
| commit | ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d (patch) | |
| tree | 7c07fdd1cbcf64326534fb441b2fa6179a587c5d /wifi/java/android | |
| parent | a3489c50b6341a79aeb5d469debf6e77b7c298d9 (diff) | |
| download | frameworks_base-ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d.zip frameworks_base-ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d.tar.gz frameworks_base-ba5065eaf3bd633aa30e0eb00b8a76b7bf33d36d.tar.bz2 | |
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
Diffstat (limited to 'wifi/java/android')
| -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; |