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

Commit 5c879e48 authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android Git Automerger
Browse files

am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event" 

# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c':
  P2PSetting:Avoid p2p_find on group removal event
parents 6639dee4 414d9e9c

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.net.NetworkInfo;

import android.net.wifi.p2p.WifiP2pConfig;

import android.net.wifi.p2p.WifiP2pInfo;

import android.net.wifi.p2p.WifiP2pDevice;

import android.net.wifi.p2p.WifiP2pDeviceList;

import android.net.wifi.p2p.WifiP2pGroup;
@@ -88,6 +89,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment 
    private boolean mWifiP2pSearching;

    private int mConnectedDevices;

    private WifiP2pGroup mConnectedGroup;

    private boolean mLastGroupFormed = false;



    private PreferenceGroup mPeersGroup;

    private PreferenceGroup mPersistentGroup;
@@ -123,15 +125,19 @@ public class WifiP2pSettings extends SettingsPreferenceFragment 
                if (mWifiP2pManager == null) return;

                NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(

                        WifiP2pManager.EXTRA_NETWORK_INFO);

                WifiP2pInfo wifip2pinfo = (WifiP2pInfo) intent.getParcelableExtra(

                        WifiP2pManager.EXTRA_WIFI_P2P_INFO);

                if (mWifiP2pManager != null) {

                    mWifiP2pManager.requestGroupInfo(mChannel, WifiP2pSettings.this);

                }

                if (networkInfo.isConnected()) {

                    if (DBG) Log.d(TAG, "Connected");

                } else {

                } else if (mLastGroupFormed != true) {

                    //start a search when we are disconnected

                    //but not on group removed broadcast event

                    startSearch();

                }

                mLastGroupFormed = wifip2pinfo.groupFormed;

            } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {

                mThisDevice = (WifiP2pDevice) intent.getParcelableExtra(

                        WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);