Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7742b91c authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 1b3dcd3b: Merge "Fix NPE while creating autonomous GO" into jb-dev 

* commit '1b3dcd3b':
  Fix NPE while creating autonomous GO
parents dcf1251c 1b3dcd3b

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

+5 −1
Original line number Diff line number Diff line
@@ -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;