Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Irfan Sheriff
2012-06-01 13:38:10 -07:00
committed by Android (Google) Code Review
parent 79f7381f8b ba5065eaf3
commit 1b3dcd3bda
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wifi/java/android/net/wifi/p2p/WifiP2pService.java
View File

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